Repository: incubator-rocketmq Updated Branches: refs/heads/master 667225688 -> 167cce034
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java b/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java index f28bffe..d9fafdd 100644 --- a/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/benchmark/TransactionProducer.java @@ -43,8 +43,8 @@ public class TransactionProducer { public static void main(String[] args) throws MQClientException, UnsupportedEncodingException { threadCount = args.length >= 1 ? Integer.parseInt(args[0]) : 32; messageSize = args.length >= 2 ? Integer.parseInt(args[1]) : 1024 * 2; - ischeck = args.length >= 3 ? Boolean.parseBoolean(args[2]) : false; - ischeckffalse = args.length >= 4 ? Boolean.parseBoolean(args[3]) : false; + ischeck = args.length >= 3 && Boolean.parseBoolean(args[2]); + ischeckffalse = args.length >= 4 && Boolean.parseBoolean(args[3]); final Message msg = buildMessage(messageSize); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/example/src/main/java/org/apache/rocketmq/example/ordermessage/Producer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/ordermessage/Producer.java b/example/src/main/java/org/apache/rocketmq/example/ordermessage/Producer.java index 52b7653..6a6bdc7 100644 --- a/example/src/main/java/org/apache/rocketmq/example/ordermessage/Producer.java +++ b/example/src/main/java/org/apache/rocketmq/example/ordermessage/Producer.java @@ -54,13 +54,7 @@ public class Producer { } producer.shutdown(); - } catch (MQClientException e) { - e.printStackTrace(); - } catch (RemotingException e) { - e.printStackTrace(); - } catch (MQBrokerException e) { - e.printStackTrace(); - } catch (InterruptedException e) { + } catch (MQClientException | RemotingException | MQBrokerException | InterruptedException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionProducer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionProducer.java b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionProducer.java index 7833576..edfad24 100644 --- a/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/transaction/TransactionProducer.java @@ -45,9 +45,7 @@ public class TransactionProducer { System.out.printf("%s%n", sendResult); Thread.sleep(10); - } catch (MQClientException e) { - e.printStackTrace(); - } catch (UnsupportedEncodingException e) { + } catch (MQClientException | UnsupportedEncodingException e) { e.printStackTrace(); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java ---------------------------------------------------------------------- diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java index 3446260..69b64ca 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java @@ -279,12 +279,10 @@ public class RouteInfoManager { try { this.lock.writeLock().lockInterruptibly(); BrokerLiveInfo brokerLiveInfo = this.brokerLiveTable.remove(brokerAddr); - if (brokerLiveInfo != null) { - log.info("unregisterBroker, remove from brokerLiveTable {}, {}", + log.info("unregisterBroker, remove from brokerLiveTable {}, {}", brokerLiveInfo != null ? "OK" : "Failed", brokerAddr - ); - } + ); this.filterServerTable.remove(brokerAddr); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java ---------------------------------------------------------------------- diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java index 2de554d..f64f9e1 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingUtil.java @@ -44,11 +44,11 @@ public class RemotingUtil { private static boolean isWindowsPlatform = false; static { - if (OS_NAME != null && OS_NAME.toLowerCase().indexOf("linux") >= 0) { + if (OS_NAME != null && OS_NAME.toLowerCase().contains("linux")) { isLinuxPlatform = true; } - if (OS_NAME != null && OS_NAME.toLowerCase().indexOf("windows") >= 0) { + if (OS_NAME != null && OS_NAME.toLowerCase().contains("windows")) { isWindowsPlatform = true; } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java b/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java index b4850d0..0993a5f 100644 --- a/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java +++ b/store/src/main/java/org/apache/rocketmq/store/AllocateMappedFileService.java @@ -213,7 +213,7 @@ public class AllocateMappedFileService extends ServiceThread { requestQueue.offer(req); try { Thread.sleep(1); - } catch (InterruptedException e1) { + } catch (InterruptedException ignored) { } } } finally { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/store/src/main/java/org/apache/rocketmq/store/CommitLog.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java index 51bba68..5ebab54 100644 --- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java +++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java @@ -1150,7 +1150,7 @@ public class CommitLog { final byte[] propertiesData = msgInner.getPropertiesString() == null ? null : msgInner.getPropertiesString().getBytes(MessageDecoder.CHARSET_UTF8); - final short propertiesLength = propertiesData == null ? 0 : (short) propertiesData.length; + final int propertiesLength = propertiesData == null ? 0 : propertiesData.length; if (propertiesLength > Short.MAX_VALUE) { log.warn("putMessage message properties length too long. length={}", propertiesData.length); @@ -1158,7 +1158,7 @@ public class CommitLog { } final byte[] topicData = msgInner.getTopic().getBytes(MessageDecoder.CHARSET_UTF8); - final int topicLength = topicData == null ? 0 : topicData.length; + final int topicLength = topicData.length; final int bodyLength = msgInner.getBody() == null ? 0 : msgInner.getBody().length; @@ -1229,7 +1229,7 @@ public class CommitLog { this.msgStoreItemMemory.put((byte) topicLength); this.msgStoreItemMemory.put(topicData); // 17 PROPERTIES - this.msgStoreItemMemory.putShort(propertiesLength); + this.msgStoreItemMemory.putShort((short) propertiesLength); if (propertiesLength > 0) this.msgStoreItemMemory.put(propertiesData); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java index dc6812d..3a43c21 100644 --- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java +++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java @@ -666,7 +666,7 @@ public class DefaultMessageStore implements MessageStore { final int size = result.getByteBuffer().getInt(); long storeTime = this.getCommitLog().pickupStoreTimestamp(phyOffset, size); return storeTime; - } catch (Exception e) { + } catch (Exception ignored) { } finally { result.release(); } @@ -1491,7 +1491,7 @@ public class DefaultMessageStore implements MessageStore { if (deleteCount > 0 && deleteLogicsFilesInterval > 0) { try { Thread.sleep(deleteLogicsFilesInterval); - } catch (InterruptedException e) { + } catch (InterruptedException ignored) { } } } @@ -1592,7 +1592,7 @@ public class DefaultMessageStore implements MessageStore { for (int i = 0; i < 50 && this.isCommitLogAvailable(); i++) { try { Thread.sleep(100); - } catch (InterruptedException e) { + } catch (InterruptedException ignored) { } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/store/src/main/java/org/apache/rocketmq/store/StoreUtil.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/StoreUtil.java b/store/src/main/java/org/apache/rocketmq/store/StoreUtil.java index afcf1c6..f63efd6 100644 --- a/store/src/main/java/org/apache/rocketmq/store/StoreUtil.java +++ b/store/src/main/java/org/apache/rocketmq/store/StoreUtil.java @@ -24,7 +24,7 @@ public class StoreUtil { @SuppressWarnings("restriction") public static long getTotalPhysicalMemorySize() { - long physicalTotal = 1024 * 1024 * 1024 * 24; + long physicalTotal = 1024 * 1024 * 1024 * 24L; OperatingSystemMXBean osmxb = ManagementFactory.getOperatingSystemMXBean(); if (osmxb instanceof com.sun.management.OperatingSystemMXBean) { physicalTotal = ((com.sun.management.OperatingSystemMXBean) osmxb).getTotalPhysicalMemorySize(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java b/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java index d7d53ef..1ebf52a 100644 --- a/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java +++ b/store/src/main/java/org/apache/rocketmq/store/index/IndexService.java @@ -74,10 +74,10 @@ public class IndexService { log.info("load index file OK, " + f.getFileName()); this.indexFileList.add(f); } catch (IOException e) { - log.error("load file " + file + " error", e); + log.error("load file {} error", file, e); return false; } catch (NumberFormatException e) { - continue; + log.error("load file {} error", file, e); } } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java index 86f86ef..bcd4c9c 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java @@ -114,7 +114,7 @@ public class BrokerConsumeStatsSubCommad implements SubCommand { String lastTime = "-"; try { lastTime = UtilAll.formatDate(new Date(offsetWrapper.getLastTimestamp()), UtilAll.YYYY_MM_DD_HH_MM_SS); - } catch (Exception e) { + } catch (Exception ignored) { } if (offsetWrapper.getLastTimestamp() > 0) http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java index 0649e71..72aad50 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java @@ -106,8 +106,7 @@ public class CLusterSendMsgRTCommand implements SubCommand { long interval = !commandLine.hasOption('i') ? 10 : Long.parseLong(commandLine .getOptionValue('i').trim()); - boolean printAsTlog = !commandLine.hasOption('p') ? false : Boolean - .parseBoolean(commandLine.getOptionValue('p').trim()); + boolean printAsTlog = commandLine.hasOption('p') && Boolean.parseBoolean(commandLine.getOptionValue('p').trim()); String machineRoom = !commandLine.hasOption('m') ? "noname" : commandLine .getOptionValue('m').trim(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java index d70bb1d..bd79bc7 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/cluster/ClusterListSubCommand.java @@ -224,18 +224,19 @@ public class ClusterListSubCommand implements SubCommand { version = kvTable.getTable().get("brokerVersionDesc"); { String[] tpss = putTps.split(" "); - if (tpss != null && tpss.length > 0) { + if (tpss.length > 0) { in = Double.parseDouble(tpss[0]); } } { String[] tpss = getTransferedTps.split(" "); - if (tpss != null && tpss.length > 0) { + if (tpss.length > 0) { out = Double.parseDouble(tpss[0]); } } } catch (Exception e) { + e.printStackTrace(); } double hour = 0.0; @@ -251,16 +252,16 @@ public class ClusterListSubCommand implements SubCommand { } System.out.printf("%-16s %-22s %-4s %-22s %-16s %19s %19s %10s %5s %6s%n", - clusterName, - brokerName, - next1.getKey().longValue(), - next1.getValue(), - version, - String.format("%9.2f(%s,%sms)", in, sendThreadPoolQueueSize, sendThreadPoolQueueHeadWaitTimeMills), - String.format("%9.2f(%s,%sms)", out, pullThreadPoolQueueSize, pullThreadPoolQueueHeadWaitTimeMills), - pageCacheLockTimeMills, - String.format("%2.2f", hour), - String.format("%.4f", space) + clusterName, + brokerName, + next1.getKey(), + next1.getValue(), + version, + String.format("%9.2f(%s,%sms)", in, sendThreadPoolQueueSize, sendThreadPoolQueueHeadWaitTimeMills), + String.format("%9.2f(%s,%sms)", out, pullThreadPoolQueueSize, pullThreadPoolQueueHeadWaitTimeMills), + pageCacheLockTimeMills, + String.format("%2.2f", hour), + String.format("%.4f", space) ); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java index 3f96c61..35735a1 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java @@ -91,6 +91,7 @@ public class DeleteSubscriptionGroupCommand implements SubCommand { DeleteTopicSubCommand.deleteTopic(adminExt, clusterName, MixAll.DLQ_GROUP_TOPIC_PREFIX + groupName); } catch (Exception e) { + e.printStackTrace(); } return; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java index 547eca7..373c895 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java @@ -53,7 +53,6 @@ public class StartMonitoringSubCommand implements SubCommand { monitorService.start(); } catch (Exception e) { e.printStackTrace(); - } finally { } } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageByQueueCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageByQueueCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageByQueueCommand.java index 0171ec8..adeb138 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageByQueueCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageByQueueCommand.java @@ -93,6 +93,7 @@ public class PrintMessageByQueueCommand implements SubCommand { System.out.printf("MSGID: %s %s BODY: %s%n", msg.getMsgId(), msg.toString(), printBody ? new String(msg.getBody(), charsetName) : "NOT PRINT BODY"); } catch (UnsupportedEncodingException e) { + e.printStackTrace(); } } } @@ -160,11 +161,11 @@ public class PrintMessageByQueueCommand implements SubCommand { String charsetName = !commandLine.hasOption('c') ? "UTF-8" : commandLine.getOptionValue('c').trim(); boolean printMsg = - !commandLine.hasOption('p') ? false : Boolean.parseBoolean(commandLine.getOptionValue('p').trim()); + commandLine.hasOption('p') && Boolean.parseBoolean(commandLine.getOptionValue('p').trim()); boolean printBody = - !commandLine.hasOption('d') ? false : Boolean.parseBoolean(commandLine.getOptionValue('d').trim()); + commandLine.hasOption('d') && Boolean.parseBoolean(commandLine.getOptionValue('d').trim()); boolean calByTag = - !commandLine.hasOption('f') ? false : Boolean.parseBoolean(commandLine.getOptionValue('f').trim()); + commandLine.hasOption('f') && Boolean.parseBoolean(commandLine.getOptionValue('f').trim()); String subExpression = !commandLine.hasOption('s') ? "*" : commandLine.getOptionValue('s').trim(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java index 23a31b5..591d27e 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/PrintMessageSubCommand.java @@ -113,8 +113,7 @@ public class PrintMessageSubCommand implements SubCommand { String subExpression = // !commandLine.hasOption('s') ? "*" : commandLine.getOptionValue('s').trim(); - boolean printBody = // - !commandLine.hasOption('d') ? true : Boolean.parseBoolean(commandLine.getOptionValue('d').trim()); + boolean printBody = !commandLine.hasOption('d') || Boolean.parseBoolean(commandLine.getOptionValue('d').trim()); consumer.start(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/message/Store.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/message/Store.java b/tools/src/main/java/org/apache/rocketmq/tools/command/message/Store.java index e8e1774..6db7813 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/message/Store.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/message/Store.java @@ -133,7 +133,6 @@ public class Store { // 5 FLAG int flag = byteBuffer.getInt(); - flag = flag + 0; // 6 QUEUEOFFSET long queueOffset = byteBuffer.getLong(); @@ -146,7 +145,6 @@ public class Store { // 9 BORNTIMESTAMP long bornTimeStamp = byteBuffer.getLong(); - bornTimeStamp = bornTimeStamp + 0; // 10 BORNHOST(IP+PORT) byteBuffer.position(byteBuffer.position() + 8); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java index eb0629a..a8ac6a4 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java @@ -59,7 +59,6 @@ public class DeleteKvConfigCommand implements SubCommand { defaultMQAdminExt.start(); defaultMQAdminExt.deleteKvConfig(namespace, key); System.out.printf("delete kv config from namespace success.%n"); - return; } catch (Exception e) { e.printStackTrace(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java index 29e5f92..c36e333 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java @@ -55,7 +55,7 @@ public class GetNamesrvConfigCommand implements SubCommand { if (servers != null && servers.length() > 0) { String[] serverArray = servers.trim().split(";"); - if (serverArray != null && serverArray.length > 0) { + if (serverArray.length > 0) { serverList = Arrays.asList(serverArray); } } @@ -71,7 +71,6 @@ public class GetNamesrvConfigCommand implements SubCommand { System.out.printf("%-50s= %s\n", key, nameServerConfigs.get(server).get(key)); } } - return; } catch (Exception e) { e.printStackTrace(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java index 976fc4c..254eaf3 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java @@ -65,7 +65,6 @@ public class UpdateKvConfigCommand implements SubCommand { defaultMQAdminExt.start(); defaultMQAdminExt.createAndUpdateKvConfig(namespace, key, value); System.out.printf("create or update kv config to namespace success.%n"); - return; } catch (Exception e) { e.printStackTrace(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java index be389d7..0b33ca2 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java @@ -69,7 +69,7 @@ public class UpdateNamesrvConfigCommand implements SubCommand { if (servers != null && servers.length() > 0) { String[] serverArray = servers.trim().split(";"); - if (serverArray != null && serverArray.length > 0) { + if (serverArray.length > 0) { serverList = Arrays.asList(serverArray); } } @@ -80,7 +80,6 @@ public class UpdateNamesrvConfigCommand implements SubCommand { System.out.printf("update name server config success!%s\n%s : %s\n", serverList == null ? "" : serverList, key, value); - return; } catch (Exception e) { e.printStackTrace(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/167cce03/tools/src/main/java/org/apache/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java index 065fa68..2bc1fd6 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java @@ -76,7 +76,7 @@ public class CloneGroupOffsetCommand implements SubCommand { defaultMQAdminExt.start(); ConsumeStats consumeStats = defaultMQAdminExt.examineConsumeStats(srcGroup); Set<MessageQueue> mqs = consumeStats.getOffsetTable().keySet(); - if (mqs != null && !mqs.isEmpty()) { + if (!mqs.isEmpty()) { TopicRouteData topicRoute = defaultMQAdminExt.examineTopicRouteInfo(topic); for (MessageQueue mq : mqs) { String addr = null;
