Mercurial > hg > Database > jungle-network
diff src/alice/jungle/codesegment/LogUpdateCodeSegment.java @ 46:fd3643699f83
modified pom.xml. fix conflict log4j libraries
author | one |
---|---|
date | Fri, 12 Jul 2013 11:27:00 +0900 |
parents | 12d87bb4b84d |
children | 686057add8a4 |
line wrap: on
line diff
--- a/src/alice/jungle/codesegment/LogUpdateCodeSegment.java Fri Jul 12 09:47:22 2013 +0900 +++ b/src/alice/jungle/codesegment/LogUpdateCodeSegment.java Fri Jul 12 11:27:00 2013 +0900 @@ -12,6 +12,7 @@ import alice.datasegment.CommandType; import alice.datasegment.Receiver; import alice.jungle.datasegment.store.operations.DefaultTreeOperationLogContainer; +import alice.jungle.transaction.NetworkDefaultJungleTreeEditor; public class LogUpdateCodeSegment extends CodeSegment { @@ -28,7 +29,7 @@ System.out.println("--LogUpdateCodeSegment--"); int index = arg1.index; DefaultTreeOperationLogContainer container = arg1.asClass(DefaultTreeOperationLogContainer.class); - if(!updaterIsMe(container)) { + if(updaterIsMe(container)) { LogUpdateCodeSegment updateCS = new LogUpdateCodeSegment(rh, key); updateCS.arg1.setKey(rh, key, index+1); return; @@ -39,7 +40,6 @@ } catch (IOException e) { e.printStackTrace(); } - //JungleManager jm = new JungleManager(); JungleTree tree = JungleManager.getJungle().getTreeByName("boards"); JungleTreeEditor editor = tree.getTreeEditor(); Either<Error, JungleTreeEditor> either = JungleManager.edit(editor, log); @@ -47,14 +47,17 @@ throw new IllegalStateException(); } editor = either.b(); - editor.success(); + either = editor.success(); + if(either.isA()) { + throw new IllegalStateException(); + } LogUpdateCodeSegment updateCS = new LogUpdateCodeSegment(rh, key); updateCS.arg1.setKey(rh, key, index+1); } private boolean updaterIsMe(DefaultTreeOperationLogContainer container) { - return true; + return false; }