[Exist-commits] SF.net SVN: exist:[8680] trunk/eXist/src/org/exist/xmlrpc

[<wol...@us...>]

Revision: 8680
          http://exist.svn.sourceforge.net/exist/?rev=8680&view=rev
Author:   wolfgang_m
Date:     2009-02-26 21:13:32 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
[bugfix] fix (incorrect) failures in test suite; changed xmlrpc interface to suppress warnings about methods returning void.

Modified Paths:
--------------
    trunk/eXist/src/org/exist/xmlrpc/RpcAPI.java
    trunk/eXist/src/org/exist/xmlrpc/RpcConnection.java

Modified: trunk/eXist/src/org/exist/xmlrpc/RpcAPI.java
===================================================================
--- trunk/eXist/src/org/exist/xmlrpc/RpcAPI.java	2009-02-26 19:48:04 UTC (rev 8679)
+++ trunk/eXist/src/org/exist/xmlrpc/RpcAPI.java	2009-02-26 21:13:32 UTC (rev 8680)
@@ -732,7 +732,7 @@
 			String start, String end)
 			throws PermissionDeniedException, EXistException, XPathException;
 	
-	void releaseQueryResult(int handle);
+	boolean releaseQueryResult(int handle);
 
 	int xupdate(String collectionName, byte[] xupdate)
             throws PermissionDeniedException, EXistException, SAXException, XPathException, LockException;

Modified: trunk/eXist/src/org/exist/xmlrpc/RpcConnection.java
===================================================================
--- trunk/eXist/src/org/exist/xmlrpc/RpcConnection.java	2009-02-26 19:48:04 UTC (rev 8679)
+++ trunk/eXist/src/org/exist/xmlrpc/RpcConnection.java	2009-02-26 21:13:32 UTC (rev 8680)
@@ -2491,9 +2491,10 @@
      *
      * @param handle an <code>int</code> value
      */
-    public void releaseQueryResult(int handle) {
+    public boolean releaseQueryResult(int handle) {
         factory.resultSets.remove(handle);
         LOG.debug("removed query result with handle " + handle);
+        return true;
     }
     
     /**
@@ -2742,6 +2743,10 @@
                 NodeValue nodeValue = (NodeValue)item;
                 Serializer serializer = broker.getSerializer();
                 serializer.reset();
+                for (Iterator i = parameters.entrySet().iterator(); i.hasNext();) {
+                    Map.Entry entry = (Map.Entry) i.next();
+                    qr.serialization.setProperty(entry.getKey().toString(), entry.getValue().toString());
+                }
                 serializer.setProperties(qr.serialization);
                 return serializer.serialize(nodeValue);
             } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.