Fix for Mastership exception fetching timestamp - from Madan

Change-Id: Ifec4fe8a559a7d5832afc8eb62c936b28fffc186

@@ -312,13 +312,15 @@ public class DeviceManager
         log.debug("Checking mastership");
         log.debug("Checking mastership");
         for (Device device : getDevices()) {
         for (Device device : getDevices()) {
             final DeviceId deviceId = device.id();
             final DeviceId deviceId = device.id();
-            log.trace("Checking device {}", deviceId);
-
+            MastershipRole myRole = mastershipService.getLocalRole(deviceId);
+            log.trace("Checking device {}. Current role is {}", deviceId, myRole);
             if (!isReachable(deviceId)) {
             if (!isReachable(deviceId)) {
-                if (mastershipService.getLocalRole(deviceId) != NONE) {
+                if (myRole != NONE) {
                     // can't be master if device is not reachable
                     // can't be master if device is not reachable
                     try {
                     try {
+                        if (myRole == MASTER) {
                             post(store.markOffline(deviceId));
                             post(store.markOffline(deviceId));
+                        }
                         //relinquish master role and ability to be backup.
                         //relinquish master role and ability to be backup.
                         mastershipService.relinquishMastership(deviceId).get();
                         mastershipService.relinquishMastership(deviceId).get();
                     } catch (InterruptedException e) {
                     } catch (InterruptedException e) {
@@ -331,7 +333,7 @@ public class DeviceManager
                 continue;
                 continue;
             }
             }
 
 
-            if (mastershipService.getLocalRole(deviceId) != NONE) {
+            if (myRole != NONE) {
                 continue;
                 continue;
             }
             }