From b4d2bba75d437ffd93ab76bdbf25b1c309efbc8c Mon Sep 17 00:00:00 2001 From: HyunGil Jeong Date: Thu, 8 Sep 2016 18:45:36 +0900 Subject: [PATCH] #2077 Fix filter being null when excludeurl is not set Fix incorrect conditional check --- .../pinpoint/plugin/tomcat/TomcatConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java index 3f7e8089f61f..49544a76d553 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatConfiguration.java @@ -28,10 +28,11 @@ public class TomcatConfiguration { public TomcatConfiguration(ProfilerConfig config) { this.tomcatHidePinpointHeader = config.readBoolean("profiler.tomcat.hidepinpointheader", true); - if (config.getTomcatExcludeProfileMethodFilter() == null) { + Filter tomcatExcludeUrlFilter = config.getTomcatExcludeUrlFilter(); + if (tomcatExcludeUrlFilter == null) { this.tomcatExcludeUrlFilter = new SkipFilter(); } else { - this.tomcatExcludeUrlFilter = config.getTomcatExcludeUrlFilter(); + this.tomcatExcludeUrlFilter = tomcatExcludeUrlFilter; } }