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

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

Revision: 8672
          http://sourceforge.net/p/bigdata/code/8672
Author:   jeremy_carroll
Date:     2014-09-29 23:29:59 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
commit r8670 did not compile correctly from ant because of layering issues. This commit backs out problematic code and replaces it

Revision Links:
--------------
    http://sourceforge.net/p/bigdata/code/8670

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java
    branches/BIGDATA_RELEASE_1_3_0/junit-ext/src/java/junit/extensions/proxy/ProxyTestSuite.java

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 22:40:46 UTC (rev 8671)
+++ 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)
@@ -76,7 +76,7 @@
 		    		protected void setUp() throws Exception {
 		    		}
 		    		protected void tearDown() throws Exception {
-		    			suite2.tearDownSuite();
+		    			((TestNanoSparqlServerWithProxyIndexManager)suite2.getDelegate()).tearDownAfterSuite();
                         /*
                          * Note: Do not clear. Will not leak unless the
                          * QueryEngine objects are pinned. They will not be

Modified: branches/BIGDATA_RELEASE_1_3_0/junit-ext/src/java/junit/extensions/proxy/ProxyTestSuite.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/junit-ext/src/java/junit/extensions/proxy/ProxyTestSuite.java	2014-09-29 22:40:46 UTC (rev 8671)
+++ branches/BIGDATA_RELEASE_1_3_0/junit-ext/src/java/junit/extensions/proxy/ProxyTestSuite.java	2014-09-29 23:29:59 UTC (rev 8672)
@@ -77,7 +77,7 @@
      * {@link ProxyTestSuite}.
      */
 
-    private Test m_delegate;
+    private final Test m_delegate;
 
     /**
      * <p>
@@ -370,12 +370,6 @@
 
     }
 
-	public void tearDownSuite() {
-		if (m_delegate instanceof AbstractIndexManagerTestCase) {
-		   ((AbstractIndexManagerTestCase)m_delegate).tearDownAfterSuite();
-		}
-		m_delegate = null;
-		
-	}
+	
     
 }

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