jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1325780 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
Date Fri, 13 Apr 2012 14:16:48 GMT
Author: thomasm
Date: Fri Apr 13 14:16:47 2012
New Revision: 1325780

URL: http://svn.apache.org/viewvc?rev=1325780&view=rev
Log:
OAK-58 connection leak

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1325780&r1=1325779&r2=1325780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
Fri Apr 13 14:16:47 2012
@@ -229,6 +229,7 @@ public class VirtualRepositoryWrapper ex
         for (MicroKernel m : mounts.values()) {
             m.dispose();
         }
+        mk.dispose();
     }
 
     public String getHeadRevision() {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java?rev=1325780&r1=1325779&r2=1325780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
Fri Apr 13 14:16:47 2012
@@ -24,7 +24,6 @@ import org.apache.jackrabbit.mk.MultiMkT
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -44,6 +43,7 @@ public class VirtualRepositoryWrapperTes
         super(url);
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -60,6 +60,7 @@ public class VirtualRepositoryWrapperTes
         mkVirtual = MicroKernelFactory.getInstance("virtual:" + url1);
     }
 
+    @Override
     @After
     public void tearDown() throws InterruptedException {
         try {
@@ -80,7 +81,6 @@ public class VirtualRepositoryWrapperTes
         }
     }
 
-    @Ignore("https://issues.apache.org/jira/browse/OAK-58")
     @Test
     public void commit() {
         if (!isSimpleKernel(mk)) {
@@ -130,7 +130,6 @@ public class VirtualRepositoryWrapperTes
 
     }
 
-    @Ignore("https://issues.apache.org/jira/browse/OAK-58")
     @Test
     public void binary() {
         int len = 1000;



Mime
View raw message