commit 22a805de6af3026171115b7a7a5aa758bfd1a0a1
author sangho <sangho@onlab.us> Fri Feb 13 09:45:43 2015 -0800
committer Yuta Higuchi <y-higuchi@onlab.us> Wed Feb 25 00:28:54 2015 +0000
tree 74cf187c9f04abefd8e1ccafa1b4495313eef377
parent 0a3bb1d9ed76529770a6b06b8f39298c5da6f82c

- Supports multi-table feature in the improved batch process in the flow rule subsystem.
- Fix a bug of unsafe type conversion in OpenFlowGroupProvider.

Change-Id: I9a62f81b66d350b84296192f770dc8987aa0967b

providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java

diff --git a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
index a6ec780..6fb5d0a 100644
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
@@ -87,11 +87,11 @@
     private static final AtomicLong XID_COUNTER = new AtomicLong(1);
     private final Map<Dpid, GroupStatsCollector> collectors = Maps.newHashMap();
     private final Map<Long, OFStatsReply> groupStats = Maps.newConcurrentMap();
-    private final Map<Integer, GroupOperation> pendingGroupOperations =
+    private final Map<GroupId, GroupOperation> pendingGroupOperations =
             Maps.newConcurrentMap();
 
     /* Map<Group ID, Transaction ID> */
-    private final Map<Integer, Long> pendingXidMaps = Maps.newConcurrentMap();
+    private final Map<GroupId, Long> pendingXidMaps = Maps.newConcurrentMap();
 
     /**
      * Creates a OpenFlow group provider.
@@ -157,9 +157,9 @@
                     log.error("Unsupported Group operation");
             }
             sw.sendMsg(groupMod);
-            pendingGroupOperations.put(groupMod.getGroup().getGroupNumber(),
-                    groupOperation);
-            pendingXidMaps.put(groupMod.getGroup().getGroupNumber(), groupModXid);
+            GroupId groudId = new DefaultGroupId(groupMod.getGroup().getGroupNumber());
+            pendingGroupOperations.put(groudId, groupOperation);
+            pendingXidMaps.put(groudId, groupModXid);
         }
      }
 
@@ -282,14 +282,14 @@
                 case ERROR:
                     OFErrorMsg errorMsg = (OFErrorMsg) msg;
                     if (errorMsg.getErrType() == OFErrorType.GROUP_MOD_FAILED) {
-                        int pendingGroupId = -1;
-                        for (Map.Entry<Integer, Long> entry: pendingXidMaps.entrySet()) {
+                        GroupId pendingGroupId = null;
+                        for (Map.Entry<GroupId, Long> entry: pendingXidMaps.entrySet()) {
                             if (entry.getValue() == errorMsg.getXid()) {
                                 pendingGroupId = entry.getKey();
                                 break;
                             }
                         }
-                        if (pendingGroupId == -1) {
+                        if (pendingGroupId == null) {
                             log.warn("Error for unknown group operation: {}",
                                     errorMsg.getXid());
                         } else {