commit 6c70f6482fff04e22d452bb9b164f4e69a694ffc
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 29 17:27:22 2015 -0700
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 29 17:40:51 2015 -0700
tree a54e1be77de5399a207aa6a353b5f945d627c0f7
parent d910a5c5e1b1fcff84f292030d892ffdb243f028

ONOS-2037: Fix cast exception on execution of "flows -j" command

Change-Id: If481573f405d812b0b103e1752a559d8f81d6bd8

core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
index 3526f23..0421e02 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
@@ -37,7 +37,7 @@
 import org.onosproject.net.flow.criteria.LambdaCriterion;
 import org.onosproject.net.flow.criteria.MetadataCriterion;
 import org.onosproject.net.flow.criteria.MplsCriterion;
-import org.onosproject.net.flow.criteria.OpticalSignalTypeCriterion;
+import org.onosproject.net.flow.criteria.OchSignalTypeCriterion;
 import org.onosproject.net.flow.criteria.PortCriterion;
 import org.onosproject.net.flow.criteria.SctpPortCriterion;
 import org.onosproject.net.flow.criteria.TcpPortCriterion;
@@ -334,9 +334,9 @@
     private static class FormatOchSigType implements CriterionTypeFormatter {
         @Override
         public ObjectNode encodeCriterion(ObjectNode root, Criterion criterion) {
-            final OpticalSignalTypeCriterion opticalSignalTypeCriterion =
-                    (OpticalSignalTypeCriterion) criterion;
-            return root.put("signalType", opticalSignalTypeCriterion.signalType());
+            final OchSignalTypeCriterion ochSignalTypeCriterion =
+                    (OchSignalTypeCriterion) criterion;
+            return root.put("ochSignalType", ochSignalTypeCriterion.signalType().name());
         }
     }