Mercurial > hg > Database > jungle-network

changeset 33:afccf06c4063

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified DefaultTreeOperationlogContainer
author one
date Mon, 01 Jul 2013 21:07:43 +0900
parents 2f1879e0acec
children bf696a6334b2
files src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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<TreeOperation> _log) throws IOException {
 		MessagePack msgpack = new MessagePack();
 		List<Value> list = new LinkedList<Value>();
 		for(TreeOperation op : _log) {
--- 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<T> newTxManager = either.b();
-		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(root,newTxManager,editor);
+		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, root,newTxManager,editor);
 		
 		return DefaultEither.newB(newTreeEditor);
 	}
@@ -141,7 +141,7 @@
 	}
 	
 	public JungleTreeEditor setNewLogAndGetEditor(TreeOperationLog _log) {
-		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(root,txManager,editor, _log);
+		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, root,txManager,editor, _log);
 		return newEditor;
 	}