cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r962681 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
Date Fri, 09 Jul 2010 20:24:54 GMT
Author: aadamchik
Date: Fri Jul  9 20:24:54 2010
New Revision: 962681

URL: http://svn.apache.org/viewvc?rev=962681&view=rev
Log:
CAY-1452 EJBQL query scalar result is not supported

* minor tweaking

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java?rev=962681&r1=962680&r2=962681&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/ClientChannel.java
Fri Jul  9 20:24:54 2010
@@ -123,7 +123,7 @@ public class ClientChannel implements Da
     public ClientConnection getConnection() {
         return connection;
     }
-    
+
     /**
      * @since 3.1
      */
@@ -157,8 +157,10 @@ public class ClientChannel implements Da
                     if (response.isList()) {
 
                         List objects = response.currentList();
-                        DeepMergeOperation merger = new DeepMergeOperation(context);
+
                         if (!objects.isEmpty()) {
+
+                            DeepMergeOperation merger = new DeepMergeOperation(context);
                             List<Object> rsMapping = info.getResultSetMapping();
                             if (rsMapping == null) {
                                 convertSingleObjects(resolver, objects, merger);



Mime
View raw message