| commit | 2d5ac52cc76a9166cc8fcbe00a761abc128a2c04 | [log] [tgz] |
|---|---|---|
| author | Yuta HIGUCHI <y-higuchi@onlab.us> | Wed Jan 22 10:21:41 2014 -0800 |
| committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Wed Jan 22 10:28:54 2014 -0800 |
| tree | 1618585efe59e8ceb8ee2a08c5a938659f2ef6d7 | |
| parent | 457e04a2a9258193e98a4b00b89af7505bb5cf26 [diff] |
Remove shaded Kryo2
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java index 8b1f7c0..607ca4d 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java +++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
@@ -31,7 +31,7 @@ import net.onrc.onos.ofcontroller.util.FlowPathUserState; import net.onrc.onos.ofcontroller.util.serializers.KryoFactory; -import com.esotericsoftware.kryo2.Kryo; +import com.esotericsoftware.kryo.Kryo; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java index dd98f4e..a7c5646 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java +++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -39,7 +39,7 @@ import com.thinkaurelius.titan.core.TitanException; -import com.esotericsoftware.kryo2.Kryo; +import com.esotericsoftware.kryo.Kryo; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java index 883f830..5998dcd 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java +++ b/src/main/java/net/onrc/onos/ofcontroller/util/serializers/KryoFactory.java
@@ -30,7 +30,7 @@ import net.onrc.onos.ofcontroller.util.Switch; import net.onrc.onos.ofcontroller.util.SwitchPort; -import com.esotericsoftware.kryo2.Kryo; +import com.esotericsoftware.kryo.Kryo; /** * Class factory for allocating Kryo instances for