From 499e012af110c6b54ccb8081f0da597e27bb6e2e Mon Sep 17 00:00:00 2001
From: emeroad <wd.kang@navercorp.com>
Date: Thu, 21 Sep 2017 11:29:35 +0900
Subject: [PATCH] [#noissue] fix findbug issue

---
 .../matcher/DefaultMultiClassBasedMatcher.java      | 13 ++++++++-----
 .../matcher/DefaultMultiPackageBasedMatcher.java    |  5 ++++-
 .../collector/config/CollectorConfiguration.java    |  6 +++---
 .../pinpoint/tools/network/TCPChecker.java          |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcher.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcher.java
index 75f4cf2eaf3d..5cead9247d9e 100644
--- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcher.java
+++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcher.java
@@ -40,11 +40,14 @@ public class DefaultMultiClassBasedMatcher implements MultiClassBasedMatcher {
         }
         this.baseClassNames = baseClassNames;
 
-        this.matcherOperand = getMatcherOperand(additional);
+        this.matcherOperand = getMatcherOperand(baseClassNames, additional);
     }
 
-    private MatcherOperand getMatcherOperand(MatcherOperand additional) {
-        MatcherOperand operand = joinOr();
+    private MatcherOperand getMatcherOperand(List<String> baseClassNames, MatcherOperand additional) {
+        MatcherOperand operand = joinOr(baseClassNames);
+        if (operand == null) {
+            throw new IllegalStateException("operand is null");
+        }
         if (additional == null) {
             return operand;
         }
@@ -53,9 +56,9 @@ private MatcherOperand getMatcherOperand(MatcherOperand additional) {
         return operand;
     }
 
-    private MatcherOperand joinOr() {
+    private MatcherOperand joinOr(List<String> baseClassNames) {
         MatcherOperand operand = null;
-        for (String baseClassName : this.baseClassNames) {
+        for (String baseClassName : baseClassNames) {
             if (operand == null) {
                 operand = new ClassInternalNameMatcherOperand(baseClassName);
             } else {
diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcher.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcher.java
index 601246ae62b9..a2b1a4abf737 100644
--- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcher.java
+++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcher.java
@@ -44,6 +44,9 @@ public class DefaultMultiPackageBasedMatcher implements MultiPackageBasedMatcher
 
         final List<String> buildBasePackageName = buildBasePackageNameList(basePackageNames);
         final MatcherOperand operand = joinOr(buildBasePackageName);
+        if (operand == null) {
+            throw new IllegalStateException("operand is null");
+        }
         this.matcherOperand = addOr(operand, additional);
 
         this.basePackageNames = Collections.unmodifiableList(buildBasePackageName);
@@ -60,7 +63,7 @@ private MatcherOperand addOr(MatcherOperand operand, MatcherOperand additional)
 
     private MatcherOperand joinOr(List<String> basePackageNames) {
         if (basePackageNames.isEmpty()) {
-            throw new IllegalArgumentException("basePackageNames must not be empty " + basePackageNames);
+            throw new IllegalArgumentException("basePackageNames must not be empty ");
         }
 
         MatcherOperand operandGroup = null;
diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java b/collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java
index 74885b4cca70..dc94c1f8731d 100644
--- a/collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java
+++ b/collector/src/main/java/com/navercorp/pinpoint/collector/config/CollectorConfiguration.java
@@ -24,12 +24,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 /**
@@ -176,8 +176,8 @@ public void readConfigFile() {
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        Assert.notNull(properties);
-        readPropertyValues(this.properties);
+        final Properties properties = Objects.requireNonNull(this.properties, "properties must not be null");
+        readPropertyValues(properties);
     }
 
     protected  void readPropertyValues(Properties properties) {
diff --git a/tools/src/main/java/com/navercorp/pinpoint/tools/network/TCPChecker.java b/tools/src/main/java/com/navercorp/pinpoint/tools/network/TCPChecker.java
index d7b61a17a538..4b8eeb67b89e 100644
--- a/tools/src/main/java/com/navercorp/pinpoint/tools/network/TCPChecker.java
+++ b/tools/src/main/java/com/navercorp/pinpoint/tools/network/TCPChecker.java
@@ -57,10 +57,10 @@ protected boolean check(InetSocketAddress address, byte[] requestData, byte[] ex
     }
 
     private Socket createSocket(InetSocketAddress socketAddress) throws IOException {
-        final Socket socket = new Socket();
-
+        Socket socket = null;
         boolean success = false;
         try {
+            socket = new Socket();
             socket.setSoTimeout(3000);
             socket.connect(socketAddress);
             success = true;