Merge remote-tracking branch 'refs/remotes/origin/master'

pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.6.1</slf4j.version>
-        <neo4j.version>1.9.M04</neo4j.version>
+        <neo4j.version>1.9.M05</neo4j.version>
         <jersey.version>1.4</jersey.version>
         <blueprints.version>1.2</blueprints.version>
         <gremlin.version>1.5</gremlin.version>

src/main/java/org/neo4j/rest/graphdb/ExecutingRestRequest.java

@@ -145,17 +145,34 @@ public RequestResult delete(String path) {
     public RequestResult post( String path, Object data ) {
         Builder builder = builder( path );
         if ( data != null ) {
-            builder = builder.entity( toInputStream(data), APPLICATION_JSON_TYPE );
+            Object payload = data instanceof InputStream ? data : JsonHelper.createJsonFrom(data);
+            builder = builder.entity( payload , APPLICATION_JSON_TYPE );
         }
         return RequestResult.extractFrom(builder.post(ClientResponse.class));
     }
 
     private InputStream toInputStream(final Object data) {
         try {
             if (data instanceof InputStream) return (InputStream) data;
-            PipedInputStream inputStream = new PipedInputStream(8 * 1024);
+            final PipedInputStream inputStream = new PipedInputStream(8 * 1024);
             final PipedOutputStream outputStream = new PipedOutputStream(inputStream);
-            pool.submit(new Runnable() { public void run() { StreamJsonHelper.writeJsonTo(data, outputStream); } });
+            pool.submit(new Runnable() {
+                public void run() {                     
+                    StreamJsonHelper.writeJsonTo(data, outputStream);
+                    try {
+                        outputStream.close();
+                    } catch (IOException e) {
+                        System.err.println("Error closing output stream for sent data "+e.getMessage());
+                        // ignore
+                    }
+                    try {
+                        inputStream.close();
+                    } catch (IOException e) {
+                        System.err.println("Error closing input stream for sent data "+e.getMessage());
+                        // ignore
+                    }
+                }
+            });
             return inputStream;
         } catch (IOException e) {
             throw new RuntimeException("Error writing "+data+" to stream",e);