svn commit: r1499980 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java

[stefanegli]

Author: stefanegli
Date: Fri Jul  5 12:05:11 2013
New Revision: 1499980

URL: http://svn.apache.org/r1499980
Log:
SLING-2945 : moving setting of discoveryService also under synchronized 
protection

Modified:
    
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java?rev=1499980&r1=1499979&r2=1499980&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
 Fri Jul  5 12:05:11 2013
@@ -160,8 +160,8 @@ public class HeartbeatHandler implements
      */
     public void initialize(final DiscoveryServiceImpl discoveryService,
             final String initialVotingId) {
-        this.discoveryService = discoveryService;
         synchronized(lock) {
+               this.discoveryService = discoveryService;
                this.nextVotingId = initialVotingId;
             issueHeartbeat();
         }