[360501] CDOQuery memory leak with getResult

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

1 files changed, 15 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
index 912accbb9c..89f19119f3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/query/CDOQueryImpl.java
@@ -82,9 +82,21 @@ public class CDOQueryImpl extends CDOQueryInfoImpl implements CDOQuery
 
   public <T> List<T> getResult(Class<T> classObject)
   {
-    AbstractQueryIterator<T> queryResult = createQueryResult(classObject);
-    view.getSession().getSessionProtocol().query(view, queryResult);
-    return queryResult.asList();
+    AbstractQueryIterator<T> queryResult = null;
+
+    try
+    {
+      queryResult = createQueryResult(classObject);
+      view.getSession().getSessionProtocol().query(view, queryResult);
+      return queryResult.asList();
+    }
+    finally
+    {
+      if (queryResult != null)
+      {
+        queryResult.close();
+      }
+    }
   }
 
   public <T> List<T> getResult()