Merge into master from pull request #292:

Bug fix in attachment point comparison. (https://github.com/floodlight/floodlight/pull/292)

src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java

@@ -255,7 +255,7 @@ public class Device implements IDevice {
         }
 
         int x = deviceManager.apComparator.compare(oldAP, newAP);
-        if (x > 0) {
+        if (x < 0) {
             // newAP replaces oldAP.
             apMap.put(id, newAP);
             this.attachmentPoints =

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -278,7 +278,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
             // and the newAP is not a broadcast domain.
             if (!topology.isConsistent(oldSw, oldPort, newSw, newPort) &&
                     !topology.isBroadcastDomainPort(newSw, newPort))
-                return 1;
+                return -1;
 
             // If newAP is inconsistent with the oldAP and
             // oldAP belongs to broadcast domain and
@@ -289,7 +289,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
                     topology.isBroadcastDomainPort(newSw, newPort) &&
                     newAP.getLastSeen() > oldAP.getLastSeen() + 
                         AttachmentPoint.EXTERNAL_TO_EXTERNAL_TIMEOUT)
-                return 1;
+                return -1;
 
             // If newAP is inconsistent with the oldAP and
             // oldAP does not to broadcast domain and
@@ -300,7 +300,7 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
                     topology.isBroadcastDomainPort(newSw, newPort) &&
                     newAP.getLastSeen() > oldAP.getLastSeen() + 
                         AttachmentPoint.OPENFLOW_TO_EXTERNAL_TIMEOUT)
-                return 1;
+                return -1;
 
             // If newAP is inconsistent with the oldAP and
             // oldAP does not to broadcast domain and
@@ -309,9 +309,9 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
             if (topology.isConsistent(oldSw, oldPort, newSw, newPort) &&
                     newAP.getLastSeen() > oldAP.getLastSeen() +
                         AttachmentPoint.CONSISTENT_TIMEOUT)
-                return 1;
+                return -1;
 
-            return -1;
+            return 1;
         }
     }
     /**