From fffc29149e5fd1ec897f94417732b747f28214cb Mon Sep 17 00:00:00 2001 From: Zeeshan Asghar Date: Mon, 18 Jan 2016 07:33:11 +0500 Subject: [PATCH] squid:S1066 Collapsible if statements should be merged squid:S1186 Methods should not be empty --- .../net/spy/memcached/MemcachedConnection.java | 4 +++- src/main/java/net/spy/memcached/TapClient.java | 2 ++ .../java/net/spy/memcached/auth/AuthThread.java | 4 +--- .../spy/memcached/compat/log/AbstractLogger.java | 4 +--- .../net/spy/memcached/compat/log/SunLogger.java | 16 +++++++--------- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java index 09f7c49ce..b6b86456f 100644 --- a/src/main/java/net/spy/memcached/MemcachedConnection.java +++ b/src/main/java/net/spy/memcached/MemcachedConnection.java @@ -456,7 +456,9 @@ public void handleIO() throws IOException { * called very often under heavy workloads, so it should not perform extensive * tasks in the same thread.

*/ - protected void handleWokenUpSelector() { } + protected void handleWokenUpSelector() { + throw new UnsupportedOperationException(); + } /** * Helper method for {@link #handleIO()} to encapsulate everything that diff --git a/src/main/java/net/spy/memcached/TapClient.java b/src/main/java/net/spy/memcached/TapClient.java index 5f4993ee4..fcfef388e 100644 --- a/src/main/java/net/spy/memcached/TapClient.java +++ b/src/main/java/net/spy/memcached/TapClient.java @@ -173,6 +173,7 @@ public Operation newOp(final MemcachedNode n, Operation op = conn.getOpFactory().tapCustom(id, message, new TapOperation.Callback() { public void receivedStatus(OperationStatus status) { + throw new UnsupportedOperationException(); } public void gotData(ResponseMessage tapMessage) { rqueue.add(tapMessage); @@ -217,6 +218,7 @@ public Operation newOp(final MemcachedNode n, Operation op = conn.getOpFactory().tapDump(id, new TapOperation.Callback() { public void receivedStatus(OperationStatus status) { + throw new UnsupportedOperationException(); } public void gotData(ResponseMessage tapMessage) { rqueue.add(tapMessage); diff --git a/src/main/java/net/spy/memcached/auth/AuthThread.java b/src/main/java/net/spy/memcached/auth/AuthThread.java index 2a635b64a..a7b540c20 100644 --- a/src/main/java/net/spy/memcached/auth/AuthThread.java +++ b/src/main/java/net/spy/memcached/auth/AuthThread.java @@ -208,11 +208,9 @@ public void complete() { // Get the new status to inspect it. priorStatus = foundStatus.get(); - if (priorStatus != null) { - if (!priorStatus.isSuccess()) { + if (priorStatus != null && !priorStatus.isSuccess()) { getLogger().warn("Authentication failed to " + node.getSocketAddress() + ", Status: " + priorStatus); - } } } diff --git a/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java b/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java index 74cd55741..4580b67ea 100644 --- a/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java @@ -54,10 +54,8 @@ public String getName() { */ public Throwable getThrowable(Object[] args) { Throwable rv = null; - if (args.length > 0) { - if (args[args.length - 1] instanceof Throwable) { + if (args.length > 0 && args[args.length - 1] instanceof Throwable) { rv = (Throwable) args[args.length - 1]; - } } return rv; } diff --git a/src/main/java/net/spy/memcached/compat/log/SunLogger.java b/src/main/java/net/spy/memcached/compat/log/SunLogger.java index af57d517e..d023974c9 100644 --- a/src/main/java/net/spy/memcached/compat/log/SunLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/SunLogger.java @@ -106,15 +106,13 @@ public void log(Level level, Object message, Throwable e) { StackTraceElement logRequestor = null; String alclass = AbstractLogger.class.getName(); for (int i = 0; i < ste.length && logRequestor == null; i++) { - if (ste[i].getClassName().equals(alclass)) { - // Make sure there's another stack frame. - if (i + 1 < ste.length) { - logRequestor = ste[i + 1]; - if (logRequestor.getClassName().equals(alclass)) { - logRequestor = null; - } // Also AbstractLogger - } // Found something that wasn't abstract logger - } // check for abstract logger + // Make sure classes are equals and there's another stack frame. + if (ste[i].getClassName().equals(alclass) && i + 1 < ste.length) { + logRequestor = ste[i + 1]; + if (logRequestor.getClassName().equals(alclass)) { + logRequestor = null; + } // Also AbstractLogger + } // check for abstract logger and found something that wasn't abstract logger } // See if we could figure out who was doing the original logging,