You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mk...@apache.org on 2013/11/15 22:58:55 UTC
svn commit: r1542415 - in /cayenne/main/branches/STABLE-3.0:
docs/doc/src/main/resources/RELEASE-NOTES.txt
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
Author: mkienenb
Date: Fri Nov 15 21:58:54 2013
New Revision: 1542415
URL: http://svn.apache.org/r1542415
Log:
CAY-1880 - objectStore snapshots never cleared from RefreshQuery when use-shared-cache unchecked
Modified:
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1542415&r1=1542414&r2=1542415&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Nov 15 21:58:54 2013
@@ -35,6 +35,7 @@ CAY-1721 Writing blobs fails (Oracle)
CAY-1725 NullPointerException from call to removeToManyTarget
CAY-1804 Serialisation of long[] type was not working correctly.
CAY-1856 Expression.expWithParameters does not work when parameters are placed in the inline collection
+CAY-1880 objectStore snapshots never cleared from RefreshQuery when "use shared cache" unchecked
----------------------------------
Release: 3.0.2
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=1542415&r1=1542414&r2=1542415&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java Fri Nov 15 21:58:54 2013
@@ -252,6 +252,9 @@ class DataDomainQueryAction implements Q
// not sending any events - peer contexts will not get refreshed
if (domain.getSharedSnapshotCache() != null) {
domain.getSharedSnapshotCache().clear();
+ } else {
+ // remove snapshots from local ObjectStore only
+ context.getObjectStore().getDataRowCache().clear();
}
context.getQueryCache().clear();
@@ -278,6 +281,14 @@ class DataDomainQueryAction implements Q
Collections.EMPTY_LIST,
ids,
Collections.EMPTY_LIST);
+ } else {
+ // remove snapshots from local ObjectStore only
+ context.getObjectStore().getDataRowCache().processSnapshotChanges(
+ context.getObjectStore(),
+ Collections.EMPTY_MAP,
+ Collections.EMPTY_LIST,
+ ids,
+ Collections.EMPTY_LIST);
}
GenericResponse response = new GenericResponse();