[Bigdata-commit] SF.net SVN: bigdata:[8673] branches/BIGDATA_RELEASE_1_3_0

[<jer...@us...>]

Revision: 8673
          http://sourceforge.net/p/bigdata/code/8673
Author:   jeremy_carroll
Date:     2014-09-30 15:57:00 +0000 (Tue, 30 Sep 2014)
Log Message:
-----------
Completing excision of clearStandAloneQECacheDuringTesting

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/QueryEngineFactory.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/QueryEngineFactory.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/QueryEngineFactory.java	2014-09-29 23:29:59 UTC (rev 8672)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/fed/QueryEngineFactory.java	2014-09-30 15:57:00 UTC (rev 8673)
@@ -71,15 +71,8 @@
     private static ConcurrentWeakValueCache<IBTreeManager, QueryEngine> standaloneQECache = new ConcurrentWeakValueCache<IBTreeManager, QueryEngine>(
             0/* queueCapacity */
     );
+    
     /**
-     *  During testing the standaloneQECache can be a source of memory leaks, this method clears it.
-     */
-    public static void clearStandAloneQECacheDuringTesting() {
-    	standaloneQECache = new ConcurrentWeakValueCache<IBTreeManager, QueryEngine>(
-                0/* queueCapacity */
-        );
-    }
-    /**
      * Weak value cache to enforce the singleton pattern for
      * {@link IBigdataClient}s (the data services are query engine peers rather
      * than controllers and handle their own query engine initialization so as

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java	2014-09-29 23:29:59 UTC (rev 8672)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java	2014-09-30 15:57:00 UTC (rev 8673)
@@ -81,7 +81,8 @@
                          * Note: Do not clear. Will not leak unless the
                          * QueryEngine objects are pinned. They will not be
                          * pinned if you shutdown the Journal correctly for each
-                         * test.
+                         * test; the call to tearDownAfterSuite above calls the destroy() method
+                         * on temporary journals, which appears to do the necessary thing.
                          */
     //		    			QueryEngineFactory.clearStandAloneQECacheDuringTesting();
 		    		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.