# HG changeset patch
# User kono
# Date 1224724744 -32400
# Node ID 537a9c6c6d9c440430112c714acb282d71c849f5
# Parent  fa8ca18f74d2d9d18c936f594a0ae507e99d046e
*** empty log message ***

diff -r fa8ca18f74d2 -r 537a9c6c6d9c rep/REPCommandPacker.java
--- a/rep/REPCommandPacker.java	Wed Oct 22 18:27:13 2008 +0900
+++ b/rep/REPCommandPacker.java	Thu Oct 23 10:19:04 2008 +0900
@@ -41,7 +41,9 @@
 	 * @see rep.REPPack#packUConv(rep.REPCommand)
 	 */
 	public ByteBuffer packUConv(REPCommand command){
-    	ByteBuffer buffer = ByteBuffer.allocateDirect(HEADER_SIZE+(command.string.length()*CHARSIZE));
+		int size = 0;
+		if (command.string!=null) size = command.string.length()*CHARSIZE;
+    	ByteBuffer buffer = ByteBuffer.allocateDirect(HEADER_SIZE+size);
     	buffer.clear();  // position = 0 
     	buffer.putInt(command.cmd.id);
     	buffer.putInt(command.sid);
diff -r fa8ca18f74d2 -r 537a9c6c6d9c rep/translator/TranslatorImpl.java
--- a/rep/translator/TranslatorImpl.java	Wed Oct 22 18:27:13 2008 +0900
+++ b/rep/translator/TranslatorImpl.java	Thu Oct 23 10:19:04 2008 +0900
@@ -94,6 +94,7 @@
 			sentMergedList.add(m);
 			editor.send(m);
 		}				
+		merge_mode = true;
 		return true;
 	}