[383379] CDOQuery / SessionManager memory leak?

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

2 files changed, 39 insertions, 24 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index 8c8c7f948b..acaea93f2b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests;singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit
  org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)"
 Import-Package: org.apache.derby.jdbc;version="[10.0.0,11.0.0)",
  org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: base;version="4.0.100";
+Export-Package: base;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -48,7 +48,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- base.impl;version="4.0.100";
+ base.impl;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -57,7 +57,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- base.util;version="4.0.100";
+ base.util;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -66,7 +66,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- derived;version="4.0.100";
+ derived;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -75,7 +75,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- derived.impl;version="4.0.100";
+ derived.impl;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -84,7 +84,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- derived.util;version="4.0.100";
+ derived.util;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -93,7 +93,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- interface_;version="4.0.100";
+ interface_;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -102,7 +102,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- interface_.impl;version="4.0.100";
+ interface_.impl;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -111,7 +111,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- interface_.util;version="4.0.100";
+ interface_.util;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -120,7 +120,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests;version="4.0.100";
+ org.eclipse.emf.cdo.tests;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -129,7 +129,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.mongodb,
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui",
- org.eclipse.emf.cdo.tests.bugzilla;version="4.0.100";
+ org.eclipse.emf.cdo.tests.bugzilla;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -138,8 +138,8 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.bundle;version="4.0.100";x-internal:=true,
- org.eclipse.emf.cdo.tests.config;version="4.0.100";
+ org.eclipse.emf.cdo.tests.bundle;version="4.0.200";x-internal:=true,
+ org.eclipse.emf.cdo.tests.config;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -148,7 +148,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.config.impl;version="4.0.100";
+ org.eclipse.emf.cdo.tests.config.impl;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -157,7 +157,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.defs;version="4.0.100";
+ org.eclipse.emf.cdo.tests.defs;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -166,7 +166,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.offline;version="4.0.100";
+ org.eclipse.emf.cdo.tests.offline;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -175,9 +175,9 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.performance;version="4.0.100",
- org.eclipse.emf.cdo.tests.performance.framework;version="4.0.100",
- org.eclipse.emf.cdo.tests.revisioncache;version="4.0.100";
+ org.eclipse.emf.cdo.tests.performance;version="4.0.200",
+ org.eclipse.emf.cdo.tests.performance.framework;version="4.0.200",
+ org.eclipse.emf.cdo.tests.revisioncache;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -186,7 +186,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- org.eclipse.emf.cdo.tests.util;version="4.0.100";
+ org.eclipse.emf.cdo.tests.util;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -195,7 +195,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- reference;version="4.0.100";
+ reference;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -204,7 +204,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- reference.impl;version="4.0.100";
+ reference.impl;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
@@ -213,7 +213,7 @@ Export-Package: base;version="4.0.100";
    org.eclipse.emf.cdo.tests.objectivity,
    org.eclipse.emf.cdo.tests.ui,
    org.eclipse.emf.cdo.tests.mongodb",
- reference.util;version="4.0.100";
+ reference.util;version="4.0.200";
   x-friends:="org.eclipse.emf.cdo.dawn.tests,
    org.eclipse.emf.cdo.tests.db,
    org.eclipse.emf.cdo.tests.db4o,
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
index f2c87e9b61..dfe1d382ae 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.tests;
 
 import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.server.ISession;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Customer;
@@ -239,6 +240,20 @@ public class OCLQueryTest extends AbstractCDOTest
     assertEquals(NUM_OF_PRODUCTS, products.size());
   }
 
+  public void testMultipleQueries() throws Exception
+  {
+    ISession session = getRepository().getSessionManager().getElements()[0];
+    int originalLength = session.getListeners().length;
+
+    for (int counter = 0; counter < 1000; counter++)
+    {
+      CDOQuery query = transaction.createQuery("ocl", "Product1.allInstances().name", getModel1Package().getProduct1());
+      query.getResult(String.class);
+    }
+
+    assertEquals(originalLength, session.getListeners().length);
+  }
+
   private CDOResource createTestSet(CDOTransaction transaction) throws CommitException
   {
     disableConsole();