jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1345141 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
Date Fri, 01 Jun 2012 12:51:04 GMT
Author: stefan
Date: Fri Jun  1 12:51:03 2012
New Revision: 1345141

URL: http://svn.apache.org/viewvc?rev=1345141&view=rev
Log:
OAK-32: Drop MicroKernel.dispose()

fixed cause of test case errors

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java?rev=1345141&r1=1345140&r2=1345141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
Fri Jun  1 12:51:03 2012
@@ -197,6 +197,8 @@ public class MicroKernelFactory {
             ((MicroKernelImpl) mk).dispose();
         } else if (mk instanceof SimpleKernelImpl) {
             ((SimpleKernelImpl) mk).dispose();
+        } else if (mk instanceof Client) {
+            ((Client) mk).dispose();
         } else if (mk instanceof LogWrapper) {
             ((LogWrapper) mk).dispose();
         } else if (mk instanceof SecurityWrapper) {
@@ -206,8 +208,7 @@ public class MicroKernelFactory {
         } else if (mk instanceof IndexWrapper) {
             ((IndexWrapper) mk).dispose();
         } else {
-            // FIXME ignore for now
-            //throw new IllegalArgumentException("instance was not created by this factory");
+            throw new IllegalArgumentException("instance was not created by this factory");
         }
     }
 



Mime
View raw message