Skip to content

Commit

Permalink
Minor checkstyle fixes.
Browse files Browse the repository at this point in the history
Change-Id: I0ead0bc582f99ce2b7c39db1ca1124f72d744c4d
Reviewed-on: http://review.couchbase.org/23980
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
  • Loading branch information
daschl authored and Michael Nitschinger committed Jan 16, 2013
1 parent 39d1a8d commit 821844d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/main/java/net/spy/memcached/MemcachedConnection.java
Expand Up @@ -45,11 +45,9 @@
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import net.spy.memcached.compat.SpyThread;
import net.spy.memcached.compat.log.LoggerFactory;
import net.spy.memcached.internal.OperationFuture;
Expand All @@ -62,7 +60,6 @@
import net.spy.memcached.ops.OperationStatus;
import net.spy.memcached.ops.TapOperation;
import net.spy.memcached.ops.VBucketAware;
import net.spy.memcached.ops.VersionOperation;
import net.spy.memcached.protocol.binary.BinaryOperationFactory;
import net.spy.memcached.protocol.binary.TapAckOperationImpl;
import net.spy.memcached.util.StringUtils;
Expand Down Expand Up @@ -421,8 +418,8 @@ public void complete() {
}
}

if (!done || testOp.isCancelled() || testOp.hasErrored() ||
testOp.isTimedOut()) {
if (!done || testOp.isCancelled() || testOp.hasErrored()
|| testOp.isTimedOut()) {
throw new ConnectException("Could not send noop upon connect! "
+ "This may indicate a running, but not responding memcached "
+ "instance.");
Expand Down

0 comments on commit 821844d

Please sign in to comment.