X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2Fgossip%2FBucketImpl.java;h=535d5c7cd68d58928c14e439eb6ca889f8aa1c22;hp=01c77f1f085823928c91dc1feb451ad6a2158c0d;hb=HEAD;hpb=b131db5779e46e9555aa3358c5b6aa13109ef8f5

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java
index 01c77f1f08..535d5c7cd6 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketImpl.java
@@ -7,38 +7,41 @@
  */
 package org.opendaylight.controller.remote.rpc.registry.gossip;
 
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
 import java.io.Serializable;
 
-public class BucketImpl<T extends Copier<T>> implements Bucket<T>, Serializable {
+final class BucketImpl<T extends BucketData<T>> implements Bucket<T>, Serializable {
     private static final long serialVersionUID = 1L;
 
-    private Long version = System.currentTimeMillis();
+    private final long version;
+
+    // Guaranteed to be non-null
+    private final T data;
 
-    private T data;
+    BucketImpl(final long version, final T data) {
+        this.version = version;
+        this.data = requireNonNull(data);
+    }
 
     @Override
-    public Long getVersion() {
+    public long getVersion() {
         return version;
     }
 
     @Override
     public T getData() {
-        if (this.data == null)
-            return null;
-
-        return data.copy();
-    }
-
-    public void setData(T data){
-        this.version = System.currentTimeMillis()+1;
-        this.data = data;
+        return data;
     }
 
     @Override
     public String toString() {
-        return "BucketImpl{" +
-                "version=" + version +
-                ", data=" + data +
-                '}';
+        return "BucketImpl{" + "version=" + version + ", data=" + data + '}';
+    }
+
+    private Object readResolve() {
+        verifyNotNull(data);
+        return this;
     }
 }