cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r556400 - in /cayenne/main/tags/3.0M1/cayenne: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
Date Sun, 15 Jul 2007 11:24:25 GMT
Author: aadamchik
Date: Sun Jul 15 04:24:24 2007
New Revision: 556400

URL: http://svn.apache.org/viewvc?view=rev&rev=556400
Log:
CAY-830 fix for 3.0M1 branch

Modified:
    cayenne/main/tags/3.0M1/cayenne/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/tags/3.0M1/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java

Modified: cayenne/main/tags/3.0M1/cayenne/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M1/cayenne/docs/doc/src/main/resources/RELEASE-NOTES.txt?view=diff&rev=556400&r1=556399&r2=556400
==============================================================================
--- cayenne/main/tags/3.0M1/cayenne/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/tags/3.0M1/cayenne/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Jul
15 04:24:24 2007
@@ -128,6 +128,7 @@
 CAY-817 HSQLDB schema generation may not correctly flush the changes
 CAY-818 Frontbase NUMBERIC type mapping typo
 CAY-823 Db-generated PK type mismatch
+CAY-830 DataChannelCallbackInterceptor.onQuery NPE
 
 API Changes
 ----------------------------------

Modified: cayenne/main/tags/3.0M1/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M1/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java?view=diff&rev=556400&r1=556399&r2=556400
==============================================================================
--- cayenne/main/tags/3.0M1/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
(original)
+++ cayenne/main/tags/3.0M1/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/intercept/DataChannelCallbackInterceptor.java
Sun Jul 15 04:24:24 2007
@@ -81,7 +81,7 @@
             List list = response.firstList();
             if (list != null
                     && !list.isEmpty()
-                    && !(query.getMetaData(originatingContext.getEntityResolver()))
+                    && !(query.getMetaData(channel.getEntityResolver()))
                             .isFetchingDataRows()) {
                 callbackRegistry.performCallbacks(LifecycleListener.POST_LOAD, list);
             }



Mime
View raw message