svn commit: r1674829 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java

[st...@apache.org]

Author: stefanegli
Date: Mon Apr 20 12:39:50 2015
New Revision: 1674829

URL: http://svn.apache.org/r1674829
Log:
SLING-4638 : removed a duplicate setting of current=false in activate - since getTopology will already return a topology-view with current==false if isolated, so no need to do it a 2nd time in activate

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java?rev=1674829&r1=1674828&r2=1674829&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java Mon Apr 20 12:39:50 2015
@@ -194,10 +194,6 @@ public class DiscoveryServiceImpl implem
 
             TopologyViewImpl newView = (TopologyViewImpl) getTopology();
             final boolean isIsolatedView = isIsolated(newView);
-            if (isIsolatedView) {
-                // SLING-4638 : mark newView as old (corresponds to isolated)
-                newView.markOld();
-            }
             if (config.isDelayInitEventUntilVoted() && isIsolatedView) {
                 // SLING-3750: just issue a log.info about the delaying
                 logger.info("activate: this instance is in isolated mode and must yet finish voting before it can send out TOPOLOGY_INIT.");