# HG changeset patch
# User pin
# Date 1219917406 -32400
# Node ID 2974db051dd8694e1be12a720539c404941a1aaf
# Parent  4ed6393ec68e0b55ba7c0c2a3a12ea72d3d4b335
*** empty log message ***

diff -r 4ed6393ec68e -r 2974db051dd8 rep/SessionManager.java
--- a/rep/SessionManager.java	Thu Aug 28 18:54:01 2008 +0900
+++ b/rep/SessionManager.java	Thu Aug 28 18:56:46 2008 +0900
@@ -352,19 +352,30 @@
 			Editor editor = session.getEditor(channel);
 			Editor prevEditor = session.getPrevEditor(editor);
 			
-			if(editor.isFinished){
-				set
-			}
-			
 			if(editor.isMerging()){
 				//Handlerを切り替える
 				setMergeState(prevEditor.getChannel(), session.getSID());
+			}else {
+				setDoWaitingState(prevEditor.getChannel(), session.getSID());
 			}
+			
+
 		}
 		break;
 		}
 	}
 
+	private void setDoWaitingState(REPSocketChannel<REPCommand> channel, int sid) {
+		if(packetSetList.size() < 0){
+			setNormalState(channel, sid);
+		}
+	}
+
+	private void setNormalState(REPSocketChannel<REPCommand> channel, int sid) {
+		SelectionKey key = channel.keyFor(selector);
+		key.attach(new REPHandlerImpl(sid, this));
+	}
+
 	private void setMergeState(REPSocketChannel<REPCommand> channel, int sid) {
 		SelectionKey key = channel.keyFor(selector);
 		key.attach(new REPHandlerInMerge(sid, this));