Mercurial > hg > RemoteEditor > REPSessionManager
diff rep/handler/Translator.java @ 439:5cbe1731f40c
fix checkAck in Editor.java
author | one |
---|---|
date | Sat, 11 Sep 2010 17:54:04 +0900 |
parents | 146d91b61b36 |
children | c50cee354f62 |
line wrap: on
line diff
--- a/rep/handler/Translator.java Sat Sep 11 16:55:31 2010 +0900 +++ b/rep/handler/Translator.java Sat Sep 11 17:54:04 2010 +0900 @@ -86,12 +86,12 @@ * @return if any sent commands output */ public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) { + sentMergedList.clear(); List<REPCommand> output1 = optimizer.optimize(output); if (output1.size()==0) { merge_mode = false; return false; } - assert(sentMergedList.size()==0); for(REPCommand c:output1) { REPCommand m = new REPCommand(c); m.setEID(REP.MERGE_EID.id); @@ -128,9 +128,9 @@ } /** - * Translate Command cmd that was received from SeMa. + * Translate Command that was received from SeMa. * @param cmd the command to be translated. - * @return translated commannd. + * @return translated command. */ public void transReceiveCmd(REPNode nextEditor,REPCommand cmd){ assert (cmd.eid != eid);