You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/10/30 12:59:59 UTC

svn commit: r1869168 - in /jackrabbit/oak/branches/1.4: ./ oak-core/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java

Author: reschke
Date: Wed Oct 30 12:59:58 2019
New Revision: 1869168

URL: http://svn.apache.org/viewvc?rev=1869168&view=rev
Log:
OAK-6300: CacheConsistencyTestBase: potential NPE in teardown (merged r1797378 into 1.4)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    jackrabbit/oak/branches/1.4/oak-core/   (props changed)
    jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1797378

Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk/oak-core:r1797378

Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java?rev=1869168&r1=1869167&r2=1869168&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java Wed Oct 30 12:59:58 2019
@@ -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();
     }