diff --git a/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java b/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
index d56d6035b226b25b8dc818227096fa3af4b4a0a5..27cb512518e6f48605a55a18a561029c123ff3ed 100644
--- a/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
+++ b/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
@@ -62,9 +62,9 @@ public class FirewallRule implements Comparable<FirewallRule> {
      */
     public int genID() {
         int uid = this.hashCode();
-        if (uid <= 0) {
+        if (uid < 0) {
             uid = Math.abs(uid);
-            uid *= 15551;
+            uid = uid * 15551;
         }
         return uid;
     }
diff --git a/src/test/java/net/floodlightcontroller/firewall/FirewallTest.java b/src/test/java/net/floodlightcontroller/firewall/FirewallTest.java
index d526640f2ac1d6e12b256fb0d5b2b52bde490c54..43cf08f0f79ee982b80008a75a59336b05e60085 100644
--- a/src/test/java/net/floodlightcontroller/firewall/FirewallTest.java
+++ b/src/test/java/net/floodlightcontroller/firewall/FirewallTest.java
@@ -5,7 +5,6 @@ import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;