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

[st...@apache.org]

Author: stefanegli
Date: Wed Aug 26 15:55:12 2015
New Revision: 1697958

URL: http://svn.apache.org/r1697958
Log:
OAK-3292 : fixing a test failure where the id of a crashed instance (which at that time is put into inactiveIds) is reused when creating a new instance - a valid case - but it is not removed from the inactiveIds - so the checkFiestaState complains

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

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java?rev=1697958&r1=1697957&r2=1697958&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java Wed Aug 26 15:55:12 2015
@@ -947,6 +947,9 @@ public class DocumentDiscoveryLiteServic
                         newInstance.startSimulatingWrites(500);
                         logger.info("Case 1: created instance: " + newInstance.ns.getClusterId());
                         instances.add(newInstance);
+                        // OAK-3292 : in case a previously crashed or shut-down instance is created again here
+                        //            make sure to remove it from inactive (if it in the inactive list at all)
+                        inactiveIds.remove(newInstance.ns.getClusterId());
                     }
                     break;
                 }