# HG changeset patch # User one # Date 1384846109 -32400 # Node ID 55a4f2bb44a8ad68dc7de4cc223bb56f01376dd1 # Parent 9865ccfd012334106d32f83bd8a5c32da8f392c6 Fixed bug NetworkDefaultJungle diff -r 9865ccfd0123 -r 55a4f2bb44a8 aliceInstall.sh --- a/aliceInstall.sh Tue Nov 19 15:52:33 2013 +0900 +++ b/aliceInstall.sh Tue Nov 19 16:28:29 2013 +0900 @@ -1,2 +1,2 @@ #!/bin/sh -mvn install:install-file -Dfile=$WORKSPACE_PATH/Alice/Alice.jar -DgroupId=alice -DartifactId=alice -Dversion=0.1 -Dpackagin=jar \ No newline at end of file +mvn install:install-file -Dfile=$WORKSPACE_PATH/Alice/Alice.jar -DgroupId=alice -DartifactId=alice -Dversion=0.1 -Dpackaging=jar \ No newline at end of file diff -r 9865ccfd0123 -r 55a4f2bb44a8 src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java --- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Tue Nov 19 15:52:33 2013 +0900 +++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Tue Nov 19 16:28:29 2013 +0900 @@ -58,6 +58,12 @@ treeEditor.exportLog = false; return treeEditor; } + + public static > NetworkDefaultJungleTreeEditor NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager _txManager,TreeEditor _editor, TreeOperationLog _log) { + NetworkDefaultJungleTreeEditor treeEditor = new NetworkDefaultJungleTreeEditor(_treeName, _root,_txManager,_editor,_log); + treeEditor.exportLog = false; + return treeEditor; + } private Either _edit(final NodePath _path,NodeEditor _e) { @@ -81,8 +87,12 @@ DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length()); TreeOperationLog newTreeOpLog = log.append(treeOperationLog); - JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor(treeName, newNode,txManager,editor,newTreeOpLog); - + JungleTreeEditor newEditor; + if(exportLog) { + newEditor = new NetworkDefaultJungleTreeEditor(treeName, newNode,txManager,editor,newTreeOpLog); + } else { + newEditor = NetworkDefaultJungleTreeEditor.NewLocalJungleTreeEditor(treeName, newNode, txManager, editor, newTreeOpLog); + } return DefaultEither.newB(newEditor); } diff -r 9865ccfd0123 -r 55a4f2bb44a8 src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java --- a/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Tue Nov 19 15:52:33 2013 +0900 +++ b/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Tue Nov 19 16:28:29 2013 +0900 @@ -46,6 +46,6 @@ ods.put(node, log.key, log.getVal()); } } - new LogUpdateCodeSegment(index+1); + new LogUpdateCodeSegment(index); } }