You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2007/08/20 19:13:17 UTC

svn commit: r567754 - /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java

Author: kmenard
Date: Mon Aug 20 10:13:16 2007
New Revision: 567754

URL: http://svn.apache.org/viewvc?rev=567754&view=rev
Log:
Prevent an NPE when doing a "refresh all" query with a disabled shared snapshot cache.

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=567754&r1=567753&r2=567754&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java Mon Aug 20 10:13:16 2007
@@ -272,7 +272,9 @@
             if (refreshQuery.isRefreshAll()) {
 
                 // not sending any events - peer contexts will not get refreshed
-                domain.getSharedSnapshotCache().clear();
+                if (domain.getSharedSnapshotCache() != null) {
+                    domain.getSharedSnapshotCache().clear();
+                }
                 context.getQueryCache().clear();
 
                 GenericResponse response = new GenericResponse();