You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/04 14:48:51 UTC

svn commit: r608837 - in /jackrabbit/branches/1.4: RELEASE-NOTES.txt jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java

Author: jukka
Date: Fri Jan  4 05:48:50 2008
New Revision: 608837

URL: http://svn.apache.org/viewvc?rev=608837&view=rev
Log:
1.4: Merged revision 608836 (JCR-1226)

Modified:
    jackrabbit/branches/1.4/RELEASE-NOTES.txt
    jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java

Modified: jackrabbit/branches/1.4/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/RELEASE-NOTES.txt?rev=608837&r1=608836&r2=608837&view=diff
==============================================================================
--- jackrabbit/branches/1.4/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.4/RELEASE-NOTES.txt Fri Jan  4 05:48:50 2008
@@ -426,7 +426,7 @@
   [JCR-953]  Support for transactions when using JCR over RMI.
   [JCR-959]  Remove @author tags in jackrabbit-jcr-rmi
 
-  Known issues
+  Bug fixes
   [JCR-1226] ServerQuery does not use RemoteAdapterFactory for creating ...
 
 jackrabbit-jcr-server

Modified: jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java?rev=608837&r1=608836&r2=608837&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/ServerQuery.java Fri Jan  4 05:48:50 2008
@@ -55,7 +55,7 @@
     /** {@inheritDoc} */
     public RemoteQueryResult execute()
             throws RepositoryException, RemoteException {
-        return new ServerQueryResult(query.execute(), getFactory());
+        return getFactory().getRemoteQueryResult(query.execute());
     }
 
     /** {@inheritDoc} */