fix same bug in binary protocol if used in sanitized mode.

Author: newroot

src/main/com/schooner/MemCached/BinaryClient.java

@@ -859,16 +859,16 @@ public Map<String, Object> getMulti(String[] keys, Integer[] hashCodes, boolean
 		(new NIOLoader(this)).doMulti(asString, cmdMap, keys, ret);
 
 		// fix the return array in case we had to rewrite any of the keys
-		for (int i=0;i<keys.length;++i) {
+		for (int i = 0; i < keys.length; ++i) {
 
-			//if key!=cleanKey and result has cleankey
+			// if key!=cleanKey and result has cleankey
 			if (!keys[i].equals(cleanKeys[i]) && ret.containsKey(cleanKeys[i])) {
 				ret.put(keys[i], ret.get(cleanKeys[i]));
 				ret.remove(cleanKeys[i]);
 			}
 
 			// backfill missing keys w/ null value
-			if (!ret.containsKey(cleanKeys[i]))
+			if (!ret.containsKey(keys[i]))
 				ret.put(keys[i], null);
 		}
 

src/test/com/schooner/MemCached/WhalinScenarioTest.java

@@ -618,7 +618,7 @@ public void testGetMultiArray() {
 		String[] values = new String[10];
 		for (int i = 0; i < 10; i++) {
 			keys[i] = "key " + i;
-			values[i]="value " + i;
+			values[i] = "value " + i;
 			mc.set(keys[i], values[i]);
 		}
 		Map<String, Object> rValues = mc.getMulti(keys, null, false);
@@ -767,4 +767,25 @@ public void testGetMulti() {
 		mc.flushAll();
 		pool.shutDown();
 	}
+
+	public void testGetMultiBin() {
+		SockIOPool pool = SockIOPool.getInstance();
+		pool.setServers(hosts);
+		pool.initialize();
+		final MemCachedClient mc = new MemCachedClient(true, true);
+		mc.setSanitizeKeys(true);
+		String[] keys = new String[10];
+		String[] values = new String[10];
+		for (int i = 0; i < 10; i++) {
+			keys[i] = "key/ " + i;
+			values[i] = "value " + i;
+			mc.set(keys[i], values[i]);
+		}
+		Map<String, Object> rValues = mc.getMulti(keys);
+		for (int i = 0; i < 10; i++) {
+			assertEquals(values[i], rValues.get("key/ " + i));
+		}
+		mc.flushAll();
+		pool.shutDown();
+	}
 }