commit 1aa71f865fcfab83d729e4d5f8376b3ed4a93049
author Ray Milkey <ray@onlab.us> Tue Apr 08 16:23:24 2014 -0700
committer Ray Milkey <ray@onlab.us> Tue Apr 08 16:40:16 2014 -0700
tree a7d0ee9d50839c340243fbf96e467e775b37cbb1
parent 5d406012b76260571d67cdc59b48d9443089118b

Enable checkstyle rule to find empty code blocks

Enabled checkstyle rule that detects empty code blocks and fixed the
violations that were discovered.

Change-Id: Icc23e028f2bbabc1849ec566923aa125b2486a3b

src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java

diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
index cbe10be..4cc68b4 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
@@ -326,9 +326,7 @@
         }
         for (IMultiEntryOperation op : ops) {
             IModifiableMultiEntryOperation mop = (IModifiableMultiEntryOperation) op;
-            if (mop.hasSucceeded()) {
-                // status update is already done, nothing to do.
-            } else {
+            if (!mop.hasSucceeded()) {
                 failExists = true;
             }
         }

src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java

diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
index 88649e7..db354eb 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
@@ -134,9 +134,6 @@
 
     @Override
     public void setVersion(final long version) {
-        if (future != null) {
-            // no-op on read
-        }
         if (writeValue == null) {
             writeValue = new VersionedValue(null, version);
         }