try to solve hang issue

Author: newroot

README

@@ -1,5 +1,8 @@
 #Author Xingen Wang ([email protected])
         Meng Li ([email protected])
+Release 2.6.5:
+since nio doesn't support soTimeout, solve this issue in com.schooner.MemCached.SockInputStream.readFromChannel(). 
+
 Release 2.6.4:
 add storeCounter with expiry support. 
 

build.properties

@@ -33,7 +33,7 @@ build.dir=classes
 test.build.dir=testclasses
 build.instr.dir=classesinstr
 project=java_memcached-release
-ver=2.6.4
+ver=2.6.5
 junit.jar=lib/junit.jar
 slf4japi.jar=lib/slf4j-api-1.6.1.jar
 slf4jsimple.jar=lib/slf4j-simple-1.6.1.jar

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.danga</groupId>
 	<artifactId>Memcached-Java-Client</artifactId>
-	<version>2.6.4</version>
+	<version>2.6.5</version>
 	<packaging>jar</packaging>
 
 	<name>Memcached-Java-Client</name>

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

@@ -32,6 +32,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.BufferUnderflowException;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 
 /**
  * {@link SockInputStream} is a inputstream based on a socket. Due to memcached
@@ -46,6 +48,8 @@ public final class SockInputStream extends InputStream {
 	private SchoonerSockIO sock;
 	private int limit;
 	private int count = 0;
+	private byte b;
+	private ByteArrayOutputStream bos = new ByteArrayOutputStream();
 
 	/**
 	 * get length of to-be-read.
@@ -102,7 +106,7 @@ public final int read() throws IOException {
 		if (count >= limit) {
 			return -1;
 		}
-		byte b = 0;
+		b = 0;
 		try {
 			b = sock.readBuf.get();
 		} catch (BufferUnderflowException e) {
@@ -124,7 +128,9 @@ public final int read() throws IOException {
 	 */
 	private final void readFromChannel() throws IOException {
 		sock.readBuf.clear();
-		sock.getChannel().read(sock.readBuf);
+		// sock.getChannel().read(sock.readBuf);
+		ReadableByteChannel wrappedChannel = Channels.newChannel(sock.getChannel().socket().getInputStream());
+		wrappedChannel.read(sock.readBuf);
 		sock.readBuf.flip();
 	}
 
@@ -171,7 +177,7 @@ public final byte[] getBuffer() throws IOException {
 	 * @since 2.5.1
 	 */
 	public final String getLine() throws IOException {
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		bos.reset();
 		int b;
 		while ((b = read()) != -1) {
 			bos.write(b);