Mercurial > hg > RemoteEditor > REPSessionManager
changeset 426:1acc3dfde5d3
minor fix.
| author | one |
|---|---|
| date | Fri, 01 Jan 2010 00:06:23 +0900 |
| parents | 91c56f90dba8 |
| children | 622a8e15ff40 |
| files | rep/handler/Translator.java test/sematest/TestInterManagerSession.java test/sematest/TestSessionManager.java |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rep/handler/Translator.java Thu Dec 31 23:01:24 2009 +0900 +++ b/rep/handler/Translator.java Fri Jan 01 00:06:23 2010 +0900 @@ -71,8 +71,8 @@ /* 残ったコマンドも再び実行させるが、まだマージされてないのでunMergedにも入れる */ output.addAll(cmds); unMergedCmds.addAll(cmds); - logger.writeLog("outputMarge:"+output); - logger.writeLog("afterMarge:"+unMergedCmds); + logger.writeLog("outputMerge:"+output); + logger.writeLog("afterMerge:"+unMergedCmds); return optimizedSend(editor,output); }
--- a/test/sematest/TestInterManagerSession.java Thu Dec 31 23:01:24 2009 +0900 +++ b/test/sematest/TestInterManagerSession.java Fri Jan 01 00:06:23 2010 +0900 @@ -150,7 +150,7 @@ * isSimulation=true thread base simulation for PathFinder * isSimulation=false socket based communication mode */ - REPServerSocketChannel.isSimulation = false; + REPServerSocketChannel.isSimulation = true; // At least 3 TestEditors are required. TestInterManagerSession test = new TestInterManagerSession(1, 2, 3); logger.setLogLevel(5);
--- a/test/sematest/TestSessionManager.java Thu Dec 31 23:01:24 2009 +0900 +++ b/test/sematest/TestSessionManager.java Fri Jan 01 00:06:23 2010 +0900 @@ -114,7 +114,7 @@ * isSimulation=true thread base simulation for PathFinder * isSimulation=false socket based communication mode */ - REPServerSocketChannel.isSimulation = false; + REPServerSocketChannel.isSimulation = true; // At least 3 TestEditors are required. TestSessionManager test = new TestSessionManager(1, 0, 3); logger.setLogLevel(5);