From f436c29f46f95e255d1113faa3482d4880e11257 Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Thu, 7 Jan 2021 20:29:10 +0800
Subject: [PATCH] fix watch/trace exclude class pattern #1638

---
 .../taobao/arthas/core/command/monitor200/MonitorCommand.java   | 2 +-
 .../com/taobao/arthas/core/command/monitor200/StackCommand.java | 2 +-
 .../arthas/core/command/monitor200/TimeTunnelCommand.java       | 2 +-
 .../com/taobao/arthas/core/command/monitor200/TraceCommand.java | 2 +-
 .../com/taobao/arthas/core/command/monitor200/WatchCommand.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java
index 0a54e98d0..edad1078c 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java
@@ -117,7 +117,7 @@ public class MonitorCommand extends EnhancerCommand {
 
     @Override
     protected Matcher getClassNameExcludeMatcher() {
-        if (classNameExcludeMatcher == null) {
+        if (classNameExcludeMatcher == null && getExcludeClassPattern() != null) {
             classNameExcludeMatcher = SearchUtils.classNameMatcher(getExcludeClassPattern(), isRegEx());
         }
         return classNameExcludeMatcher;
diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java
index 6a4bacfa9..985ae5e6c 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java
@@ -95,7 +95,7 @@ public class StackCommand extends EnhancerCommand {
 
     @Override
     protected Matcher getClassNameExcludeMatcher() {
-        if (classNameExcludeMatcher == null) {
+        if (classNameExcludeMatcher == null && getExcludeClassPattern() != null) {
             classNameExcludeMatcher = SearchUtils.classNameMatcher(getExcludeClassPattern(), isRegEx());
         }
         return classNameExcludeMatcher;
diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java
index d3cab59c6..9a499648b 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java
@@ -307,7 +307,7 @@ public class TimeTunnelCommand extends EnhancerCommand {
 
     @Override
     protected Matcher getClassNameExcludeMatcher() {
-        if (classNameExcludeMatcher == null) {
+        if (classNameExcludeMatcher == null && getExcludeClassPattern() != null) {
             classNameExcludeMatcher = SearchUtils.classNameMatcher(getExcludeClassPattern(), isRegEx());
         }
         return classNameExcludeMatcher;
diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java
index 26b69e750..ae227d744 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java
@@ -136,7 +136,7 @@ public class TraceCommand extends EnhancerCommand {
 
     @Override
     protected Matcher getClassNameExcludeMatcher() {
-        if (classNameExcludeMatcher == null) {
+        if (classNameExcludeMatcher == null && getExcludeClassPattern() != null) {
             classNameExcludeMatcher = SearchUtils.classNameMatcher(getExcludeClassPattern(), isRegEx());
         }
         return classNameExcludeMatcher;
diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java
index 9bd6c48bb..3d009fc44 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java
@@ -176,7 +176,7 @@ public class WatchCommand extends EnhancerCommand {
 
     @Override
     protected Matcher getClassNameExcludeMatcher() {
-        if (classNameExcludeMatcher == null) {
+        if (classNameExcludeMatcher == null && getExcludeClassPattern() != null) {
             classNameExcludeMatcher = SearchUtils.classNameMatcher(getExcludeClassPattern(), isRegEx());
         }
         return classNameExcludeMatcher;