revert some of newer features

Author: gwhalin

src/com/danga/MemCached/CacheTask.java

@@ -30,6 +30,10 @@ public CacheTask( String cmd, byte[] val ) {
 		this.val  = val;
 	}
 
+	public String getCmd() {
+		return this.cmd;
+	}
+
 	public void setSocket( SockIOPool.SockIO socket ) {
 		this.socket = socket;
 	}

src/com/danga/MemCached/MemCacheThreadPoolExecutor.java

@@ -11,9 +11,14 @@
 
 import java.util.concurrent.*;
 import java.util.*;
+import org.apache.log4j.Logger;
 
 public class MemCacheThreadPoolExecutor extends ThreadPoolExecutor {
 
+	// logger
+	private static Logger log =
+		Logger.getLogger( MemCacheThreadPoolExecutor.class.getName() );
+
 	private String poolName;
 	private String host;
 	private SockIOPool.SockIO socket;
@@ -61,34 +66,40 @@ public MemCacheThreadPoolExecutor( int corePoolSize, int maximumPoolSize,
 	}
 
 	protected void beforeExecute( Thread t, Runnable r ) {
-		super.beforeExecute( t, r );
 
 		// make sure we have a valid connected socket
 		// if not, then get a new connection
-		if ( socketOnDemand
-				|| socket == null
-				|| !socket.isConnected() )
-			socket = SockIOPool.getInstance( poolName ).getConnection( host );
-
-		((CacheTask)r).setSocket( socket );
+		if ( socketOnDemand || this.socket == null || !this.socket.isConnected() ) {
+			((CacheTask)r).setSocket( SockIOPool.getInstance( poolName ).getConnection( host ) );
+		}
+		else {
+			((CacheTask)r).setSocket( this.socket );
+		}
 
+		super.beforeExecute( t, r );
 	}
 
 	protected void afterExecute( Runnable r, Throwable t ) {
 		super.afterExecute( r, t );
 
-		socket = ((CacheTask)r).getSocket();
 		if ( socketOnDemand ) {
 			// return to pool
-			if ( socket != null )
-				socket.close();
+			if ( ((CacheTask)r).getSocket() != null )
+				((CacheTask)r).getSocket().close();
 		}
 		else {
 			// freshen the socket so we have it around
-			if ( socket != null )
-				socket.touch();
+			if ( this.socket != null )
+				this.socket.touch();
 			else
 				this.socket = null;
 		}
 	}
+
+	protected void terminated() {
+		if ( this.socket != null && this.socket.isConnected() )
+			this.socket.close();
+
+		super.terminated();
+	}
 }