commit ac13cb6381594a0ef86d845185ce8ffe6d034159
author Pankaj Berde <pankaj@onlab.us> Mon Oct 21 09:06:11 2013 -0700
committer Pankaj Berde <pankaj@onlab.us> Mon Oct 21 09:06:11 2013 -0700
tree d6660420c5c79060155bb89a2fc6bb74b5b43989
parent 584d83d3fbf0f8218a6e9dd6b684c5e13a281470
parent 71c96dd16c4306ec72c31f89d7408de7887184a3

Merge pull request #435 from y-higuchi/permgen_tuning

Assure larger PermGen size to avoid PermGen errors on some environment.

pom.xml

diff --git a/pom.xml b/pom.xml
index 1d52337..ae020cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,7 +350,7 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.2</version>
+      <version>3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/net/floodlightcontroller/core/internal/Controller.java

diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 44510a7..134a3b0 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -2352,7 +2352,7 @@
                         // new controller node IP
                         addedControllerNodeIPs.put(controllerID, discoveredIP);
                     } 
-                    else if (curIP.equals(discoveredIP)) {
+                    else if (!curIP.equals(discoveredIP)) {
                         // IP changed                    
                         removedControllerNodeIPs.put(controllerID, curIP);
                         addedControllerNodeIPs.put(controllerID, discoveredIP);