# HG changeset patch # User one # Date 1372680463 -32400 # Node ID afccf06c4063cb82a16bfb48e549163637de8aad # Parent 2f1879e0acec31c568fe705e72c7a822aacc9446 modified DefaultTreeOperationlogContainer diff -r 2f1879e0acec -r afccf06c4063 src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java --- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java Mon Jul 01 20:54:07 2013 +0900 +++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java Mon Jul 01 21:07:43 2013 +0900 @@ -88,7 +88,7 @@ } - public void unconvert(TreeOperationLog _log) throws IOException { + public void unconvert(Iterable _log) throws IOException { MessagePack msgpack = new MessagePack(); List list = new LinkedList(); for(TreeOperation op : _log) { diff -r 2f1879e0acec -r afccf06c4063 src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java --- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Mon Jul 01 20:54:07 2013 +0900 +++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Mon Jul 01 21:07:43 2013 +0900 @@ -117,7 +117,7 @@ } TransactionManager newTxManager = either.b(); - JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor(root,newTxManager,editor); + JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor(treeName, root,newTxManager,editor); return DefaultEither.newB(newTreeEditor); } @@ -141,7 +141,7 @@ } public JungleTreeEditor setNewLogAndGetEditor(TreeOperationLog _log) { - JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor(root,txManager,editor, _log); + JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor(treeName, root,txManager,editor, _log); return newEditor; }