commit 38feb6eddc2c8a764195321b551916eb27232f79
author Jonathan Hart <jono@onlab.us> Mon Aug 29 22:54:16 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 29 23:16:45 2016 +0000
tree 26c7030a8748c70263c513b99c55d2a8f865c828
parent feb95f16329e3729be7aec1a0c898670d0b3c929

Revert "Fix for ONOS-5032 and ONOS-5034"

This reverts commit 50ad080683317df192a0f7159d9902dc1c403ed2.

Change-Id: Id2f9924a28c18686b4be30200244dbd0c975e90a

core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
index a359862..b4449ae 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/DistributedHostStore.java
@@ -48,7 +48,6 @@
 import org.onosproject.store.service.MapEventListener;
 import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.StorageService;
-import org.onosproject.store.service.WallClockTimestamp;
 import org.slf4j.Logger;
 
 import java.util.Collection;
@@ -88,8 +87,7 @@
     @Activate
     public void activate() {
         KryoNamespace.Builder hostSerializer = KryoNamespace.newBuilder()
-                .register(KryoNamespaces.API)
-                .register(WallClockTimestamp.class);
+                .register(KryoNamespaces.API);
 
         hostsConsistentMap = storageService.<HostId, DefaultHost>consistentMapBuilder()
                 .withName("onos-hosts")
@@ -124,9 +122,7 @@
         if (!Objects.equals(existingHost.providerId(), providerId) ||
                 !Objects.equals(existingHost.mac(), hostDescription.hwAddress()) ||
                 !Objects.equals(existingHost.vlan(), hostDescription.vlan()) ||
-                !Objects.equals(existingHost.location(), hostDescription.location()) ||
-                hostDescription.timestamp() == null ||
-                hostDescription.timestamp().isNewerThan(existingHost.timestamp())) {
+                !Objects.equals(existingHost.location(), hostDescription.location())) {
             return true;
         }
 
@@ -177,13 +173,13 @@
                            } else {
                                annotations = hostDescription.annotations();
                            }
+
                            return new DefaultHost(providerId,
                                                   hostId,
                                                   hostDescription.hwAddress(),
                                                   hostDescription.vlan(),
                                                   location,
                                                   addresses,
-                                                  hostDescription.timestamp(),
                                                   annotations);
                        });
         return null;
@@ -306,4 +302,3 @@
         }
     }
 }
-