diff src/alice/jungle/transaction/NetworkTransactionManager.java @ 42:4419ac56cbfd

implemented serverName filed
author one
date Thu, 11 Jul 2013 19:58:36 +0900
parents b8b9668da13c
children 12d87bb4b84d
line wrap: on
line diff
--- a/src/alice/jungle/transaction/NetworkTransactionManager.java	Tue Jul 09 17:37:09 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkTransactionManager.java	Thu Jul 11 19:58:36 2013 +0900
@@ -24,6 +24,7 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultError;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
+import jungle.test.bbs.codesegment.NullCodeSegmentForUpdate;
 
 public class NetworkTransactionManager<T extends TreeNode<T>> implements TransactionManager<T> 
 {
@@ -33,15 +34,17 @@
 	private final ChangeListWriter writer;
 	private final String uuid;	
 	private final String treeName;	
+	private final String serverName;
 	
 	public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext<T> _tip,
-			AtomicReservableReference<TreeContext<T>> _repository,String _uuid)
+			AtomicReservableReference<TreeContext<T>> _repository,String _uuid, String _serverName)
 	{
 		repository = _repository;
 		tip = _tip;
 		writer = _writer;
 		uuid = _uuid;
 		treeName = _treeName;
+		serverName = _serverName;
 	}
 	
 	@Override
@@ -71,22 +74,22 @@
 			return DefaultEither.newA((Error)new DefaultError());
 		}
 		try {
-			updateDataSegment(uuid, treeName, list);
+			putDataSegment(uuid, treeName, list);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		reservation.confirm();
-		TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid);
+		TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid, serverName);
 		return DefaultEither.newB(txManager);
 	}
 	
-	private void updateDataSegment(String _uuid, String _treeName, Iterable<TreeOperation> _log) throws IOException {
+	private void putDataSegment(String _uuid, String _treeName, Iterable<TreeOperation> _log) throws IOException {
 		DefaultTreeOperationLogContainer container = new DefaultTreeOperationLogContainer();
 		container.setTreeName(_treeName);
 		container.setUUID(_uuid);
 		container.unconvert(_log);
-		LogUpdateCodeSegment cs = new LogUpdateCodeSegment();
-		cs.ods.update("local", "log", container);
+		NullCodeSegmentForUpdate cs = new NullCodeSegmentForUpdate();
+		cs.ods.put("local", "log", container);
 		
 	}