Mercurial > hg > RemoteEditor > REPSessionManager

changeset 173:48c64244d4d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author pin
date Thu, 28 Aug 2008 18:59:30 +0900
parents a776ec9ed848
children 72252e970a8b
files rep/REP.java rep/SessionManager.java
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rep/REP.java	Thu Aug 28 18:57:17 2008 +0900
+++ b/rep/REP.java	Thu Aug 28 18:59:30 2008 +0900
@@ -46,6 +46,8 @@
 	
 	public static final int MERGE_EID = -2;
 	public static final int SMCMD_CH_MASTER = 79;
+	public static final int SMCMD_UPDATE_UP = 80;
+	public static final int SMCMD_UPDATE_DOWN = 81;
 	
 	//public static final int SMCMD_START_MERGE = 73;
 	//public static final int SMCMD_START_MERGE_ACK = 74;
--- a/rep/SessionManager.java	Thu Aug 28 18:57:17 2008 +0900
+++ b/rep/SessionManager.java	Thu Aug 28 18:59:30 2008 +0900
@@ -104,7 +104,7 @@
 			if(key.isAcceptable()){
 				/*** serverChannelはenableになったSelectionKeyのchannel ***/
 				REPServerSocketChannel serverChannel = (REPServerSocketChannel)key.channel();
-				REPSocketChannel channel = serverChannel.accept();	//keyからchannelを取って、accept 
+				REPSocketChannel channel = serverChannel.accept1();	//keyからchannelを取って、accept 
 				registerChannel (selector, channel, SelectionKey.OP_READ);
 				channel = null;