233273: [QUERY] Develop Query mechanism

https://bugs.eclipse.org/bugs/show_bug.cgi?id=233273

1 files changed, 10 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
index d4cb15d494..ebc18999b3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/QueryManager.java
@@ -88,7 +88,7 @@ public class QueryManager
     {
       if (listener == null)
       {
-        final IView view = (IView) getQueryResult().getView();
+        final IView view = (IView)getQueryResult().getView();
 
         listener = new IListener()
         {
@@ -105,7 +105,7 @@ public class QueryManager
             }
           }
         };
-        
+
         // Add listener to the session
         view.getSession().addListener(listener);
       }
@@ -113,13 +113,14 @@ public class QueryManager
 
     public void run()
     {
-   
-      CloseableIterator<Object> itrResult = reader.createQueryIterator(queryResult.getQueryParameter());
-
       ResultWriterQueue<Object> resultQueue = queryResult.getResultWriterQueue();
+
+      CloseableIterator<Object> itrResult = null;
       
       try
       {
+        itrResult = reader.createQueryIterator(queryResult.getQueryParameter());
+
         while (itrResult.hasNext())
         {
           resultQueue.add(itrResult.next());
@@ -137,10 +138,11 @@ public class QueryManager
       {
         resultQueue.release();
         
-        itrResult.close();
-        
+        if (itrResult != null)
+          itrResult.close();
+
         unregisterQueryNative(this);
-        
+
       }
     }