removed Jedis try resource block - move to try catch

Author: DvirDukhan

src/main/java/com/redislabs/redisgraph/RedisGraph.java

@@ -89,16 +89,22 @@ public ResultSet query(String graphId, String query, Object ...args) {
             query = String.format(query, args);
         }
         graphCaches.putIfAbsent(graphId, new GraphCache(graphId, this));
-
-        try (Jedis conn = getConnection()) {
-            List<Object> rawResponsw = sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply();
+        Jedis conn = null;
+        List<Object> rawResponse = new ArrayList<Object>();
+        try  {
+            conn = getConnection();
+            rawResponse= sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply();
             conn.close();
-            return new ResultSetImpl(rawResponsw, graphCaches.get(graphId));
-        }
-        catch (Exception e){
-//            e.printStackTrace();
-            return new ResultSetImpl(new ArrayList<Object>(), graphCaches.get(graphId));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            if(conn != null && conn.isConnected()){
+                conn.close();
+                throw e;
+            }
         }
+        return new ResultSetImpl(rawResponse, graphCaches.get(graphId));
+
     }
 
     /**

src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java

@@ -296,8 +296,9 @@ public void tinyTestMultiThread(){
         ResultSet resultSet = api.query("social", "CREATE ({name:'roi',age:32})");
         api.query("social", "MATCH (a:person) RETURN a");
         for (int i =0; i < 10000; i++){
-            List<ResultSet> resultSets = IntStream.range(0,10).parallel().
-                    mapToObj(j-> api.query("social", "MATCH (a:person) RETURN a")).
+            List<ResultSet> resultSets = IntStream.range(0,16).parallel().
+                    mapToObj(
+                            j-> api.query("social", "MATCH (a:person) RETURN a")).
                     collect(Collectors.toList());
 
         }
@@ -309,7 +310,7 @@ public void testMultiThread(){
 
         Assert.assertNotNull(api.query("social", "CREATE (:person {name:'roi', age:32})-[:knows]->(:person {name:'amit',age:30}) "));
 
-        List<ResultSet> resultSets = IntStream.range(0,10).parallel().
+        List<ResultSet> resultSets = IntStream.range(0,16).parallel().
                 mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, a.age")).
                 collect(Collectors.toList());
 
@@ -372,7 +373,7 @@ public void testMultiThread(){
         Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'b'})"));
         Assert.assertNotNull(api.query("social", "MATCH (a:worker), (b:worker) WHERE (a.lastName = 'a' AND b.lastName='b')  CREATE (a)-[:worksWith]->(b)"));
 
-        resultSets = IntStream.range(0,10).parallel().
+        resultSets = IntStream.range(0,16).parallel().
                 mapToObj(i-> api.query("social", "MATCH (a:worker)-[r:worksWith]->(b:worker) RETURN a,r")).
                 collect(Collectors.toList());