Fix issue gwhalin#50

Author: root

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

@@ -243,6 +243,10 @@ public boolean set(String key, Object value, Date expiry) {
 	public boolean set(String key, Object value, Date expiry, Integer hashCode) {
 		return set("set", key, value, expiry, hashCode, 0L, primitiveAsString);
 	}
+	
+	public boolean set(String key, Object value, Date expiry, Integer hashCode, boolean asString) {
+		return set("set", key, value, expiry, hashCode, 0L, asString);
+	}
 
 	public boolean add(String key, Object value) {
 		return set("add", key, value, null, null, 0L, primitiveAsString);
@@ -334,6 +338,8 @@ public boolean replace(String key, Object value, Date expiry, Integer hashCode)
 	 *            expiration
 	 * @param hashCode
 	 *            if not null, then the int hashcode to use
+	 * @param asString
+	 *            if true, then store all primitives as their string value
 	 * @return true/false indicating success
 	 */
 	private boolean set(String cmdname, String key, Object value, Date expiry, Integer hashCode, Long casUnique,

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

@@ -156,6 +156,10 @@ public boolean set(String key, Object value, Date expiry) {
 	public boolean set(String key, Object value, Date expiry, Integer hashCode) {
 		return set("set", key, value, expiry, hashCode, 0L);
 	}
+	
+	public boolean set(String key, Object value, Date expiry, Integer hashCode, boolean asString) {
+		return set("set", key, value, expiry, hashCode, 0L);
+	}
 
 	public boolean add(String key, Object value) {
 		return set("add", key, value, null, null, 0L);

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

@@ -238,6 +238,10 @@ public boolean set(String key, Object value, Date expiry) {
 	public boolean set(String key, Object value, Date expiry, Integer hashCode) {
 		return set(OPCODE_SET, key, value, expiry, hashCode, 0L, primitiveAsString);
 	}
+	
+	public boolean set(String key, Object value, Date expiry, Integer hashCode, boolean asString) {
+		return set(OPCODE_SET, key, value, expiry, hashCode, 0L, asString);
+	}
 
 	public boolean add(String key, Object value) {
 		return set(OPCODE_ADD, key, value, null, null, 0L, primitiveAsString);
@@ -370,7 +374,7 @@ private boolean set(byte opcode, String key, Object value, Date expiry, Integer
 
 		try {
 			// store flags
-			int flags = NativeHandler.getMarkerFlag(value);
+			int flags = asString ? MemCachedClient.MARKER_STRING : NativeHandler.getMarkerFlag(value);
 			byte[] buf = key.getBytes();
 			sock.writeBuf.clear();
 			sock.writeBuf.put(MAGIC_REQ);

src/main/java/com/whalin/MemCached/MemCachedClient.java

@@ -665,6 +665,26 @@ public boolean set(String key, Object value, Date expiry) {
 	public boolean set(String key, Object value, Date expiry, Integer hashCode) {
 		return client.set(key, value, expiry, hashCode);
 	}
+	
+	/**
+	 * Stores data on the server; the key, value, and an expiration time are
+	 * specified.
+	 * 
+	 * @param key
+	 *            key to store data under
+	 * @param value
+	 *            value to store
+	 * @param expiry
+	 *            when to expire the record
+	 * @param hashCode
+	 *            if not null, then the int hashcode to use
+	 * @param asString
+	 *            if true, then store all primitives as their string value
+	 * @return true, if the data was successfully stored
+	 */
+	public boolean set(String key, Object value, Date expiry, Integer hashCode, boolean asString) {
+		return client.set(key, value, expiry, hashCode, asString);
+	}
 
 	/**
 	 * Adds data to the server; only the key and the value are specified.
@@ -834,7 +854,7 @@ public boolean storeCounter(String key, Long counter, Date date) {
 	 * @return true/false indicating success
 	 */
 	public boolean storeCounter(String key, Long counter, Date date, Integer hashCode) {
-		return set(key, counter, date, hashCode);
+		return set(key, counter, date, hashCode, true);
 	}
 
 	/**

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

@@ -183,13 +183,13 @@ public void testSetString() {
 
 	public void testStoreCounterStringLong() {
 		mc.storeCounter("foo", 10L);
-		Long s = (Long) mc.get("foo");
+		Long s = Long.parseLong(mc.get("foo").toString());
 		assertTrue(s == 10L);
 	}
 
 	public void testStoreCounterStringLongInteger() {
 		mc.storeCounter("foo", 10L, "foo".hashCode());
-		Long s = (Long) mc.get("foo");
+		Long s = Long.parseLong(mc.get("foo").toString());
 		assertTrue(s == 10L);
 	}
 
@@ -830,8 +830,8 @@ public void testStoreCounterWithoutAsString() {
 		final String key = "testKey" + Math.random();
 		mc.storeCounter(key, 3L);
 		mc.incr(key);
-		long value = (Long) mc.getCounter(key);
-		assertEquals(value, -1L);
+		long value = mc.getCounter(key);
+		assertEquals(value, 4L);
 	}
 
 	public void testSpecialCharacterSetString() {

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

@@ -314,13 +314,13 @@ public void testSetExp() {
 
 	public void testStoreCounterStringLong() {
 		mc.storeCounter("foo", 10L);
-		Long s = (Long) mc.get("foo");
+		Long s = Long.parseLong(mc.get("foo").toString());
 		assertTrue(s == 10L);
 	}
 
 	public void testStoreCounterStringLongInteger() {
 		mc.storeCounter("foo", 10L, "foo".hashCode());
-		Long s = (Long) mc.get("foo");
+		Long s = Long.parseLong(mc.get("foo").toString());
 		assertTrue(s == 10L);
 	}
 
@@ -986,8 +986,8 @@ public void testStoreCounterWithoutAsString() {
 		final String key = "testKey" + Math.random();
 		mc.storeCounter(key, 3L);
 		mc.incr(key);
-		long value = (Long) mc.getCounter(key);
-		assertEquals(value, -1L);
+		long value = mc.getCounter(key);
+		assertEquals(value, 4L);
 	}
 
 	//