Skip to content

Commit e17c17c

Browse files
committed
small bug in pool, fix copyright, fix package name
1 parent 8fa9830 commit e17c17c

9 files changed

+16
-24
lines changed

Diff for: src/com/meetup/memcached/ByteBufArrayInputStream.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
33
* All rights reserved.
44
*
55
* This library is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
1616
* @author greg whalin <[email protected]>
1717
* @version 2.0
1818
*/
19-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2020

2121
import java.io.ByteArrayOutputStream;
2222
import java.io.IOException;

Diff for: src/com/meetup/memcached/ContextObjectInputStream.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/**
2-
* MemCached Java client
32
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
@@ -22,7 +21,7 @@
2221
* @author Vin Chawla <[email protected]>
2322
* @version 2.0
2423
*/
25-
package com.whalin.memcached;
24+
package com.meetup.memcached;
2625

2726
import java.util.*;
2827
import java.util.zip.*;

Diff for: src/com/meetup/memcached/ErrorHandler.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* MemCached Java client
3-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
65
* This library is free software; you can redistribute it and/or
@@ -21,7 +20,7 @@
2120
* @author Dan Zivkovic <[email protected]>
2221
* @version 2.0
2322
*/
24-
package com.whalin.memcached;
23+
package com.meetup.memcached;
2524

2625
public interface ErrorHandler {
2726

Diff for: src/com/meetup/memcached/LineInputStream.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* MemCached Java client
3-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
65
* This library is free software; you can redistribute it and/or
@@ -17,7 +16,7 @@
1716
* @author greg whalin <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.io.IOException;
2322

Diff for: src/com/meetup/memcached/Logger.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* MemCached Java Client Logger
3-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
65
* This library is free software; you can redistribute it and/or
@@ -17,7 +16,7 @@
1716
* @author Greg Whalin <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.util.*;
2322

Diff for: src/com/meetup/memcached/MemcachedClient.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/**
2-
* Memcached client for Java
32
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
@@ -17,7 +16,7 @@
1716
* @author Greg Whalin <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.util.*;
2322
import java.util.zip.*;

Diff for: src/com/meetup/memcached/NativeHandler.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* MemCached Java client
3-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
65
* This library is free software; you can redistribute it and/or
@@ -17,7 +16,7 @@
1716
* @author Greg Whalin <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.util.Date;
2322
import org.apache.log4j.Logger;

Diff for: src/com/meetup/memcached/NestedIOException.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
* MemCached Java client
3-
* Copyright (c) 2007 Greg Whalin
2+
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
65
* This library is free software; you can redistribute it and/or
@@ -17,7 +16,7 @@
1716
* @author Kevin A. Burton <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.io.*;
2322

Diff for: src/com/meetup/memcached/SockIOPool.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/**
2-
* MemCached client for Java, connection pool for Socket IO
32
* Copyright (c) 2008 Greg Whalin
43
* All rights reserved.
54
*
@@ -17,7 +16,7 @@
1716
* @author greg whalin <[email protected]>
1817
* @version 2.0
1918
*/
20-
package com.whalin.memcached;
19+
package com.meetup.memcached;
2120

2221
import java.security.MessageDigest;
2322
import java.security.NoSuchAlgorithmException;
@@ -889,7 +888,7 @@ public SockIO getSock( String key, Integer hashCode ) {
889888
return null;
890889

891890
// if only one server, return it
892-
if ( ( this.hashingAlg == CONSISTENT_HASH && consistentBuckets.size() == 0 )
891+
if ( ( this.hashingAlg == CONSISTENT_HASH && consistentBuckets.size() == 1 )
893892
|| ( buckets != null && buckets.size() == 1 ) ) {
894893

895894
SockIO sock = ( this.hashingAlg == CONSISTENT_HASH )

0 commit comments

Comments
 (0)