test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 19:57:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

NotSerializableException: QueryResultsManager #PL-4353

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-04-06 12:19:02 +00:00
parent 65b5b98236
commit 3905c61a4f
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/core/src/com/haulmont/cuba/core/app/queryresults/QueryResultsManager.java
View File

@ -14,16 +14,15 @@ import com.haulmont.cuba.core.app.ClusterManagerAPI;
import com.haulmont.cuba.core.app.DataServiceQueryBuilder;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.core.sys.AppContext;
import com.haulmont.cuba.core.sys.QueryHolder;
import com.haulmont.cuba.core.sys.persistence.DbTypeConverter;
import com.haulmont.cuba.security.app.UserSessionsAPI;
import com.haulmont.cuba.security.entity.UserSessionEntity;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.annotation.ManagedBean;
import javax.inject.Inject;
import java.io.Serializable;
import java.sql.SQLException;
import java.sql.Types;
import java.util.*;
@ -127,7 +126,9 @@ public class QueryResultsManager implements QueryResultsManagerAPI {
QueryHolder queryHolder = new QueryHolder(query);
QueryHolder oldQueryHolder = recentQueries.put(queryKey, queryHolder);
userSessionSource.getUserSession().setAttribute("_recentQueries", recentQueries);
// do not set to session attribute recentQueries directly, it contains reference to QueryResultsManager class
// copy data to new LinkedHashMap
userSessionSource.getUserSession().setAttribute("_recentQueries", new LinkedHashMap<>(recentQueries));
return queryHolder.equals(oldQueryHolder);
}
@ -226,29 +227,4 @@ public class QueryResultsManager implements QueryResultsManagerAPI {
throw new RuntimeException(e);
}
}
private static class QueryHolder implements Serializable {
private static final long serialVersionUID = -6055610488135337366L;
public final LoadContext.Query query;
public QueryHolder(LoadContext.Query query) {
this.query = query;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
QueryHolder that = (QueryHolder) o;
if (query == null || that.query == null) return false;
if (!ObjectUtils.equals(query.getQueryString(), that.query.getQueryString())) return false;
if (!ObjectUtils.equals(query.getParameters(), that.query.getParameters())) return false;
return true;
}
}
}

40
modules/global/src/com/haulmont/cuba/core/sys/QueryHolder.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2008-2015 Haulmont. All rights reserved.
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.core.sys;
import com.haulmont.cuba.core.global.LoadContext;
import org.apache.commons.lang.ObjectUtils;
import java.io.Serializable;
/**
* @author artamonov
* @version $Id$
*/
public class QueryHolder implements Serializable {
private static final long serialVersionUID = -6055610488135337366L;
public final LoadContext.Query query;
public QueryHolder(LoadContext.Query query) {
this.query = query;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
QueryHolder that = (QueryHolder) o;
if (query == null || that.query == null) return false;
if (!ObjectUtils.equals(query.getQueryString(), that.query.getQueryString())) return false;
if (!ObjectUtils.equals(query.getParameters(), that.query.getParameters())) return false;
return true;
}
}