Committed by
Gerrit Code Review
Fix ClassCastException
Change-Id: I1c9e6a37c6871bd8186d5ab19a87268d9250aacd
Showing
2 changed files
with
3 additions
and
5 deletions
... | @@ -1093,7 +1093,7 @@ public class SpringOpenTTP extends AbstractHandlerBehaviour | ... | @@ -1093,7 +1093,7 @@ public class SpringOpenTTP extends AbstractHandlerBehaviour |
1093 | * case, we refer to this as a dummy group. | 1093 | * case, we refer to this as a dummy group. |
1094 | * | 1094 | * |
1095 | */ | 1095 | */ |
1096 | - private class SpringOpenGroup implements NextGroup { | 1096 | + protected class SpringOpenGroup implements NextGroup { |
1097 | private final boolean dummy; | 1097 | private final boolean dummy; |
1098 | private final GroupKey key; | 1098 | private final GroupKey key; |
1099 | private final TrafficTreatment treatment; | 1099 | private final TrafficTreatment treatment; | ... | ... |
... | @@ -42,7 +42,6 @@ import org.onosproject.net.flowobjective.FilteringObjective; | ... | @@ -42,7 +42,6 @@ import org.onosproject.net.flowobjective.FilteringObjective; |
42 | import org.onosproject.net.flowobjective.ForwardingObjective; | 42 | import org.onosproject.net.flowobjective.ForwardingObjective; |
43 | import org.onosproject.net.flowobjective.ObjectiveError; | 43 | import org.onosproject.net.flowobjective.ObjectiveError; |
44 | import org.onosproject.net.group.Group; | 44 | import org.onosproject.net.group.Group; |
45 | -import org.onosproject.net.group.GroupKey; | ||
46 | 45 | ||
47 | /** | 46 | /** |
48 | * Spring-open driver implementation for Dell hardware switches. | 47 | * Spring-open driver implementation for Dell hardware switches. |
... | @@ -137,9 +136,8 @@ public class SpringOpenTTPDell extends SpringOpenTTP { | ... | @@ -137,9 +136,8 @@ public class SpringOpenTTPDell extends SpringOpenTTP { |
137 | NextGroup next = flowObjectiveStore.getNextGroup(fwd.nextId()); | 136 | NextGroup next = flowObjectiveStore.getNextGroup(fwd.nextId()); |
138 | 137 | ||
139 | if (next != null) { | 138 | if (next != null) { |
140 | - GroupKey key = appKryo.deserialize(next.data()); | 139 | + SpringOpenGroup soGroup = appKryo.deserialize(next.data()); |
141 | - | 140 | + Group group = groupService.getGroup(deviceId, soGroup.key()); |
142 | - Group group = groupService.getGroup(deviceId, key); | ||
143 | 141 | ||
144 | if (group == null) { | 142 | if (group == null) { |
145 | log.warn("The group left!"); | 143 | log.warn("The group left!"); | ... | ... |
-
Please register or login to post a comment