Mercurial > hg > RemoteEditor > REPSessionManager

changeset 84:54334d83194a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Fri, 21 Dec 2007 16:03:04 +0900
parents 9381b4734a0b
children d5cd4d103eea
files rep/SessionManager.java
diffstat 1 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/rep/SessionManager.java	Fri Dec 21 13:55:24 2007 +0900
+++ b/rep/SessionManager.java	Fri Dec 21 16:03:04 2007 +0900
@@ -156,10 +156,10 @@
 			gui.setComboSession(session.getSID(), session.getName());
 			gui.setComboEditor(editor.getEID(), editor.getChannel());
 			session.addToRoutingTable(editor);
-			receivedCommand.setCMD(REP.SMCMD_PUT_ACK);
-			receivedCommand.setEID(1);
-			receivedCommand.setSID(session.getSID());
-			editor.send(receivedCommand);
+			sendCommand.setCMD(REP.SMCMD_PUT_ACK);
+			sendCommand.setEID(1);
+			sendCommand.setSID(session.getSID());
+			editor.send(sendCommand);
 			
 			//if(isMaster){
 			SessionXMLEncoder sessionEncoder = new SessionXMLEncoder(session);
@@ -186,9 +186,11 @@
 				int eid2 = session.addEditor(editor);
 				editor.setEID(eid2);
 				//REPPacketSend send = new REPPacketSend(channel);
-				receivedCommand.setCMD(REP.SMCMD_SELECT_ACK);
-				receivedCommand.setEID(eid2);
-				send.send(receivedCommand);
+				//receivedCommand.setCMD(REP.SMCMD_SELECT_ACK);
+				//receivedCommand.setEID(eid2);
+				sendCommand.setCMD(REP.SMCMD_SELECT_ACK);
+				sendCommand.setEID(eid2);
+				send.send(sendCommand);
 			}else {
 				
 			}
@@ -432,7 +434,7 @@
 		System.out.println("Action!");
 		SocketChannel editorChannel = event.getEditorChannel();
 		int sid = event.getSID();
-		int eid = 0;
+		//int eid = 0;
 		//int eid = event.getEID(); 
 		//sessionlist.addEditor(editorChannel, sid, eid);
 		Editor editor = new Editor(editorChannel);
@@ -444,11 +446,12 @@
 		REPCommand command = new REPCommand();
 		command.setCMD(REP.SMCMD_SELECT);
 		command.setSID(sid);
+		command.setString(editor.getHost() + ":" + editor.getPort());
 		
 		master.send(command);
 		
-		REPPacketSend send = new REPPacketSend(editorChannel);
-		send.send(new REPCommand(REP.SMCMD_SELECT_ACK, sid, eid, 0,0,0,""));
+		//REPPacketSend send = new REPPacketSend(editorChannel);
+		//send.send(new REPCommand(REP.SMCMD_SELECT_ACK, sid, eid, 0,0,0,""));