[skywalking] branch master updated: Bugfix: endpoint grouping rules may be not unique (#3510)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 321a88f  Bugfix: endpoint grouping rules may be not unique (#3510)
321a88f is described below

commit 321a88f57559ab4fdd6c800ef697938e6b9d2215
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Sep 23 22:32:28 2019 +0800

    Bugfix: endpoint grouping rules may be not unique (#3510)
---
 .../java/org/apache/skywalking/apm/util/StringFormatGroup.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
index e2b7a4f..497e815 100644
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
+++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
@@ -41,8 +41,10 @@ public class StringFormatGroup {
      * @param ruleRegex to match target string.
      */
     public void addRule(String name, String ruleRegex) {
-        if (rules.contains(name)) {
-            return;
+        for (PatternRule rule : rules) {
+            if (rule.name.equals(name)) {
+                return;
+            }
         }
         PatternRule rule = new PatternRule(name, ruleRegex);
         rules.add(rule);
@@ -69,7 +71,7 @@ public class StringFormatGroup {
             '}';
     }
 
-    public class FormatResult {
+    public static class FormatResult {
         private boolean match;
         private String name;
 
@@ -87,7 +89,7 @@ public class StringFormatGroup {
         }
     }
 
-    private class PatternRule {
+    private static class PatternRule {
         private String name;
         private Pattern pattern;