Mercurial > hg > Members > nobuyasu > jungle-network
comparison src/alice/jungle/transaction/NetworkTransactionManager.java @ 91:2c7b3f2b2ee1
Removed serverName field
author | one |
---|---|
date | Mon, 11 Nov 2013 19:22:47 +0900 |
parents | f142dd4abc74 |
children |
comparison
equal
deleted
inserted
replaced
90:eef737ab3b2c | 91:2c7b3f2b2ee1 |
---|---|
27 private final AtomicReservableReference<TreeContext<T>> repository; | 27 private final AtomicReservableReference<TreeContext<T>> repository; |
28 private final TreeContext<T> tip; | 28 private final TreeContext<T> tip; |
29 private final ChangeListWriter writer; | 29 private final ChangeListWriter writer; |
30 private final String uuid; | 30 private final String uuid; |
31 private final String treeName; | 31 private final String treeName; |
32 private final String serverName; | |
33 | 32 |
34 public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext<T> _tip, | 33 public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext<T> _tip, |
35 AtomicReservableReference<TreeContext<T>> _repository,String _uuid, String _serverName) | 34 AtomicReservableReference<TreeContext<T>> _repository,String _uuid) |
36 { | 35 { |
37 repository = _repository; | 36 repository = _repository; |
38 tip = _tip; | 37 tip = _tip; |
39 writer = _writer; | 38 writer = _writer; |
40 uuid = _uuid; | 39 uuid = _uuid; |
41 treeName = _treeName; | 40 treeName = _treeName; |
42 serverName = _serverName; | |
43 } | 41 } |
44 | 42 |
45 @Override | 43 @Override |
46 public Either<Error, TransactionManager<T>> commit(T _newRoot,final TreeOperationLog _log) { | 44 public Either<Error, TransactionManager<T>> commit(T _newRoot,final TreeOperationLog _log) { |
47 ChangeSet cs = tip.getChangeSet(); | 45 ChangeSet cs = tip.getChangeSet(); |
75 Result r = writer.write(list); | 73 Result r = writer.write(list); |
76 if(r != Result.SUCCESS) { | 74 if(r != Result.SUCCESS) { |
77 return DefaultEither.newA((Error)new DefaultError()); | 75 return DefaultEither.newA((Error)new DefaultError()); |
78 } | 76 } |
79 reservation.confirm(); | 77 reservation.confirm(); |
80 TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid, serverName); | 78 TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid); |
81 return DefaultEither.newB(txManager); | 79 return DefaultEither.newB(txManager); |
82 } | 80 } |
83 | 81 |
84 @Override | 82 @Override |
85 public long getRevision() | 83 public long getRevision() |