# HG changeset patch
# User one
# Date 1227605183 -32400
# Node ID 2724cf17e9f34def518df9dbae05af95fd31bf80
# Parent  3fecde2392a8ba97c6b02f855df1cd34522609de
single mode quit

diff -r 3fecde2392a8 -r 2724cf17e9f3 rep/handler/Editor.java
--- a/rep/handler/Editor.java	Tue Nov 25 17:55:56 2008 +0900
+++ b/rep/handler/Editor.java	Tue Nov 25 18:26:23 2008 +0900
@@ -49,6 +49,7 @@
 				// Second Phase が終わって同期が終了。
 				removeFromSentList(command);
 				SessionManager.logger.writeLog("Complete "+command);
+				checkQuit();
 				return;
 			}
 			checkReturnedCommand(command);
@@ -204,6 +205,7 @@
 		preMergeCommand.string = "";
 		// merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。
 		if (noMergeMode) {
+			checkQuit();
 			endMerge();
 			return;
 		}
@@ -274,7 +276,7 @@
 	}
 
 	private boolean checkQuit() {
-		if (sentList.size()==0&&!isMerging()) {
+		if (quit2!=null && sentList.size()==0&&!isMerging()) {
 			send(quit2);
 			quit2 = null;
 			return true;
diff -r 3fecde2392a8 -r 2724cf17e9f3 test/sematest/TestEditor.java
--- a/test/sematest/TestEditor.java	Tue Nov 25 17:55:56 2008 +0900
+++ b/test/sematest/TestEditor.java	Tue Nov 25 18:26:23 2008 +0900
@@ -64,7 +64,7 @@
 			cmds.add(new REPCommand(REP.SMCMD_PUT,0,0,0,0,name+"-file"));
 			cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"m0"));
 			cmds.add(new REPCommand(REP.REPCMD_DELETE_USER,0,0,0,0,"m0"));
-			//cmds.add(new REPCommand(REP.SMCMD_QUIT,0,0,0,0,""));
+			cmds.add(new REPCommand(REP.SMCMD_QUIT,0,0,0,0,""));
 		} else {
 			text = new Text(new String[0]);
 			cmds.add(new REPCommand(REP.SMCMD_JOIN,0,0,0,0,name));