fix problem w/ serialized objects and also add more to unit tests

Author: gwhalin

src/com/danga/MemCached/MemCachedClient.java

@@ -1541,7 +1541,7 @@ private void loadItems( LineInputStream input, Map<String,Object> hm, boolean as
 				}
 
 				// we can only take out serialized objects
-				if ( ( flag & F_SERIALIZED ) == 0 ) {
+				if ( ( flag & F_SERIALIZED ) != F_SERIALIZED ) {
 					if ( primitiveAsString || asString ) {
 						// pulling out string value
 						log.info( "++++ retrieving object and stuffing into a string." );
@@ -2025,10 +2025,9 @@ public void loadItemsNIO( boolean asString, Map<String, StringBuilder> sockKeys,
 				timeRemaining = timeout;
 
 				while ( numConns > 0 && timeRemaining > 0 ) {
-					int n = selector.select( 3000 );
+					int n = selector.select( 5000 );
 					if ( n > 0 ) {
 					    // we've got some activity; handle it
-					    //
 					    Iterator<SelectionKey> it = selector.selectedKeys().iterator();
 					    while ( it.hasNext() ) {
 					        SelectionKey key = it.next();
@@ -2038,6 +2037,7 @@ public void loadItemsNIO( boolean asString, Map<String, StringBuilder> sockKeys,
 					}
 					else {
 					    // timeout likely... better check
+						// TODO:  This seems like a problem area that we need to figure out how to handle.
 						log.error( "selector timed out waiting for activity" );
 					}
 

src/com/danga/MemCached/test/UnitTests.java

@@ -22,6 +22,7 @@
 
 import com.danga.MemCached.*;
 import java.util.*;
+import java.io.Serializable;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -238,6 +239,13 @@ public static void test22() {
 		log.error( "+ store/retrieve byte[] type test passed" );
     }
 
+    public static void test23() {
+		TestClass tc = new TestClass( "foo", "bar", new Integer( 32 ) );
+        mc.set( "foo", tc );
+		assert tc.equals( (TestClass)mc.get( "foo" ) );
+		log.error( "+ store/retrieve serialized object test passed" );
+    }
+
 	/**
 	 * This runs through some simple tests of the MemCacheClient.
 	 *
@@ -295,6 +303,7 @@ public static void main(String[] args) {
 			test17();
 			test21();
 			test22();
+			test23();
 
 			for ( int i = 0; i < 3; i++ )
 				test19();
@@ -320,4 +329,38 @@ public static void main(String[] args) {
 			test20( 900*1024, 32*1024, 1 );
 		}
 	}
+
+	/** 
+	 * Class for testing serializing of objects. 
+	 * 
+	 * @author $Author: $
+	 * @version $Revision: $ $Date: $
+	 */
+	public static final class TestClass implements Serializable {
+
+		private String field1;
+		private String field2;
+		private Integer field3;
+
+		public TestClass( String field1, String field2, Integer field3 ) {
+			this.field1 = field1;
+			this.field2 = field2;
+			this.field3 = field3;
+		}
+
+		public String getField1() { return this.field1; }
+		public String getField2() { return this.field2; }
+		public Integer getField3() { return this.field3; }
+
+		public boolean equals( Object o ) {
+			if ( this == o ) return true;
+			if ( !( o instanceof TestClass ) ) return false;
+
+			TestClass obj = (TestClass)o;
+
+			return ( ( this.field1 == obj.getField1() || ( this.field1 != null && this.field1.equals( obj.getField1() ) ) )
+					&& ( this.field2 == obj.getField2() || ( this.field2 != null && this.field2.equals( obj.getField2() ) ) )
+					&& ( this.field3 == obj.getField3() || ( this.field3 != null && this.field3.equals( obj.getField3() ) ) ) );
+		}
+	}
 }