minor Device - Mastership fixes

Change-Id: Id6d46e22fb67f01cd5c0802cf4fad135a043ec77

@@ -269,10 +269,6 @@ implements MastershipService, MastershipAdminService {
 
 
         @Override
         @Override
         public void notify(MastershipEvent event) {
         public void notify(MastershipEvent event) {
-            if (clusterService.getLocalNode().id().equals(event.roleInfo().master())) {
-                log.info("ignoring locally-generated event {}", event);
-               // return;
-            }
             log.info("dispatching mastership event {}", event);
             log.info("dispatching mastership event {}", event);
             eventDispatcher.post(event);
             eventDispatcher.post(event);
         }
         }

@@ -432,7 +432,6 @@ public class DeviceManager
                     if (!isReachable(device)) {
                     if (!isReachable(device)) {
                         log.warn("Device {} has disconnected after this event", did);
                         log.warn("Device {} has disconnected after this event", did);
                         mastershipService.relinquishMastership(did);
                         mastershipService.relinquishMastership(did);
-                        applyRole(did, MastershipRole.STANDBY);
                         return;
                         return;
                     }
                     }
                     //flag the device as online. Is there a better way to do this?
                     //flag the device as online. Is there a better way to do this?
@@ -448,6 +447,7 @@ public class DeviceManager
                 if (!isReachable(getDevice(did))) {
                 if (!isReachable(getDevice(did))) {
                     log.warn("Device {} has disconnected after this event", did);
                     log.warn("Device {} has disconnected after this event", did);
                     mastershipService.relinquishMastership(did);
                     mastershipService.relinquishMastership(did);
+                    return;
                 }
                 }
                 applyRole(did, MastershipRole.STANDBY);
                 applyRole(did, MastershipRole.STANDBY);
             }
             }
@@ -455,19 +455,21 @@ public class DeviceManager
 
 
         // checks for duplicate event, returning true if one is found.
         // checks for duplicate event, returning true if one is found.
         private boolean checkDuplicate(RoleInfo roleInfo, int term) {
         private boolean checkDuplicate(RoleInfo roleInfo, int term) {
-            synchronized (eventCache) {
-                if (eventCache.get(term).contains(roleInfo)) {
-                    log.info("duplicate event detected; ignoring");
-                    return true;
-                } else {
-                    eventCache.put(term, roleInfo);
-                    // purge by-term oldest entries to keep the cache size under limit
-                    if (eventCache.size() > cacheSize) {
-                        eventCache.removeAll(term - cacheSize);
-                    }
+            // turning off duplicate check
             return false;
             return false;
-                }
-            }
+//            synchronized (eventCache) {
+//                if (eventCache.get(term).contains(roleInfo)) {
+//                    log.info("duplicate event detected; ignoring");
+//                    return true;
+//                } else {
+//                    eventCache.put(term, roleInfo);
+//                    // purge by-term oldest entries to keep the cache size under limit
+//                    if (eventCache.size() > cacheSize) {
+//                        eventCache.removeAll(term - cacheSize);
+//                    }
+//                    return false;
+//                }
+//            }
         }
         }
 
 
     }
     }

@@ -358,6 +358,7 @@ implements MastershipStore {
 
 
         @Override
         @Override
         public void entryAdded(EntryEvent<DeviceId, RoleValue> event) {
         public void entryAdded(EntryEvent<DeviceId, RoleValue> event) {
+            entryUpdated(event);
         }
         }
 
 
         @Override
         @Override
@@ -366,7 +367,6 @@ implements MastershipStore {
 
 
         @Override
         @Override
         public void entryUpdated(EntryEvent<DeviceId, RoleValue> event) {
         public void entryUpdated(EntryEvent<DeviceId, RoleValue> event) {
-            // this subsumes entryAdded event
             notifyDelegate(new MastershipEvent(
             notifyDelegate(new MastershipEvent(
                     MASTER_CHANGED, event.getKey(), event.getValue().roleInfo()));
                     MASTER_CHANGED, event.getKey(), event.getValue().roleInfo()));
         }
         }