svn commit: r1797378 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java

[reschke]

Author: reschke
Date: Fri Jun  2 11:57:18 2017
New Revision: 1797378

URL: http://svn.apache.org/viewvc?rev=1797378&view=rev
Log:
OAK-6300: CacheConsistencyTestBase: potential NPE in teardown

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java?rev=1797378&r1=1797377&r2=1797378&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
 Fri Jun  2 11:57:18 2017
@@ -53,10 +53,12 @@ public abstract class CacheConsistencyTe
 
     @After
     public void after() throws Exception {
-        for (String id : removeMe) {
-            ds.remove(Collection.NODES, id);
+        if (ds != null) {
+            for (String id : removeMe) {
+                ds.remove(Collection.NODES, id);
+            }
+            ds.dispose();
         }
-        ds.dispose();
         fixture.dispose();
     }