# HG changeset patch # User one # Date 1374199684 -32400 # Node ID 85bc7416ae02c8f8c07eb4f7e293c427ed9646a2 # Parent e871e8fc3f692a4c3a9fe09ec6036ee2862e48a5 modified some container using SingletonMessage diff -r e871e8fc3f69 -r 85bc7416ae02 .classpath --- a/.classpath Mon Jul 15 18:26:10 2013 +0900 +++ b/.classpath Fri Jul 19 11:08:04 2013 +0900 @@ -19,6 +19,6 @@ - + diff -r e871e8fc3f69 -r 85bc7416ae02 src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java --- a/src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java Mon Jul 15 18:26:10 2013 +0900 +++ b/src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java Fri Jul 19 11:08:04 2013 +0900 @@ -15,6 +15,8 @@ import org.msgpack.template.OrdinalEnumTemplate; import org.msgpack.type.Value; +import alice.codesegment.SingletonMessage; + @Message public class DefaultNodeOperationContainer { @@ -42,7 +44,8 @@ } public void unconvert(NodeOperation op) throws IOException { - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); pos = op.getPosition(); key = op.getKey(); value = null; @@ -59,7 +62,8 @@ } public NodeOperation convert() throws IOException{ - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); msgpack.register(Command.class, new OrdinalEnumTemplate(Command.class)); Command c = msgpack.convert(commandValue, Command.class); ByteBuffer b = null; diff -r e871e8fc3f69 -r 85bc7416ae02 src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java --- a/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java Mon Jul 15 18:26:10 2013 +0900 +++ b/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java Fri Jul 19 11:08:04 2013 +0900 @@ -13,6 +13,8 @@ import org.msgpack.template.ListTemplate; import org.msgpack.type.Value; +import alice.codesegment.SingletonMessage; + @Message public class DefaultNodePathContainer { @@ -41,7 +43,6 @@ } /* Remove first Element(-1). */ list.remove(0); - msgpack.register(List.class, new ListTemplate(IntegerTemplate.getInstance())); Value v = msgpack.unconvert(list); pathValue = v; } diff -r e871e8fc3f69 -r 85bc7416ae02 src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java --- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java Mon Jul 15 18:26:10 2013 +0900 +++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java Fri Jul 19 11:08:04 2013 +0900 @@ -15,6 +15,8 @@ import org.msgpack.annotation.Message; import org.msgpack.type.Value; +import alice.codesegment.SingletonMessage; + @Message public class DefaultTreeOperationContainer { @@ -81,13 +83,15 @@ public void unconvert(DefaultNodeOperationContainer _op, DefaultNodePathContainer _path) throws IOException { - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); pathValue = msgpack.unconvert(_path); opValue = msgpack.unconvert(_op); } public TreeOperation convert() throws IOException { - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); DefaultNodePathContainer pathContainer = msgpack.convert(pathValue, DefaultNodePathContainer.class); DefaultNodeOperationContainer opContainer = msgpack.convert(opValue, DefaultNodeOperationContainer.class); return new DefaultTreeOperation(pathContainer.convert(), opContainer.convert()); diff -r e871e8fc3f69 -r 85bc7416ae02 src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java --- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java Mon Jul 15 18:26:10 2013 +0900 +++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java Fri Jul 19 11:08:04 2013 +0900 @@ -22,6 +22,8 @@ import org.msgpack.template.ValueTemplate; import org.msgpack.type.Value; +import alice.codesegment.SingletonMessage; + @Message public class DefaultTreeOperationLogContainer { @@ -92,7 +94,8 @@ } public void unconvert(Iterable _log) throws IOException { - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); List list = new LinkedList(); for(TreeOperation op : _log) { NodeOperation nOp = op.getNodeOperation(); @@ -108,7 +111,8 @@ } public DefaultTreeOperationLog convert() throws IOException { - MessagePack msgpack = new MessagePack(); +// MessagePack msgpack = new MessagePack(); + MessagePack msgpack = SingletonMessage.getInstance(); msgpack.register(List.class, new ListTemplate(ValueTemplate.getInstance())); List listValue = msgpack.convert(logValue, List.class); List logList = new LinkedList();