| commit | e3ba6956e0e148bd822fd80dedac8ab9982f07c7 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Mon May 02 11:02:36 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Mon May 02 23:57:09 2016 +0000 |
| tree | ed826587f5555e2a0863d07ec98cd570698e76b2 | |
| parent | 33f90a95ede46806b213cba0a25efeda42befa1a [diff] |
Fix ClassCastException Change-Id: I1c9e6a37c6871bd8186d5ab19a87268d9250aacd
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java index 6dab296..049e0c5 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTP.java
@@ -1093,7 +1093,7 @@ * case, we refer to this as a dummy group. * */ - private class SpringOpenGroup implements NextGroup { + protected class SpringOpenGroup implements NextGroup { private final boolean dummy; private final GroupKey key; private final TrafficTreatment treatment;
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java index 786c48b..e1249a9 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java
@@ -42,7 +42,6 @@ import org.onosproject.net.flowobjective.ForwardingObjective; import org.onosproject.net.flowobjective.ObjectiveError; import org.onosproject.net.group.Group; -import org.onosproject.net.group.GroupKey; /** * Spring-open driver implementation for Dell hardware switches. @@ -137,9 +136,8 @@ NextGroup next = flowObjectiveStore.getNextGroup(fwd.nextId()); if (next != null) { - GroupKey key = appKryo.deserialize(next.data()); - - Group group = groupService.getGroup(deviceId, key); + SpringOpenGroup soGroup = appKryo.deserialize(next.data()); + Group group = groupService.getGroup(deviceId, soGroup.key()); if (group == null) { log.warn("The group left!");