commit 7ff01813fee556b42aff6bd1dcf689cc3a6e33e1
author sangho <sangho@onlab.us> Mon Feb 09 16:21:53 2015 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Wed Feb 11 23:56:53 2015 +0000
tree 35ee4ac5a6a50388c7f646384acf3cd0a048a0bb
parent a7a4e5d2b5f4c051752d52ed60f3f9e1bfe6ed4c

ONOS-944: Implemented a Group operation failure handler in GroupManger and SimpleGroupStore.

Change-Id: Ib3be4d534ceff04af2dad0c062fd4cd63d49ee82

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 1c9f801..0bd147d 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
@@ -282,8 +282,10 @@
                         } else {
                             GroupOperation operation =
                                     pendingGroupOperations.get(pendingGroupId);
+                            DeviceId deviceId = DeviceId.deviceId(Dpid.uri(dpid));
                             if (operation != null) {
-                                providerService.groupOperationFailed(operation);
+                                providerService.groupOperationFailed(deviceId,
+                                        operation);
                                 pendingGroupOperations.remove(pendingGroupId);
                                 pendingXidMaps.remove(pendingGroupId);
                                 log.warn("Received an group mod error {}", msg);