changeset 5169:20f8a3215fa8

fixed regex in MethodFilter
author Doug Simon <doug.simon@oracle.com>
date Wed, 28 Mar 2012 22:17:10 +0200
parents 519d27db8eb9
children 597eade2394e
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java
diffstat 2 files changed, 20 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java	Wed Mar 28 22:14:14 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugConfig.java	Wed Mar 28 22:17:10 2012 +0200
@@ -54,6 +54,7 @@
             this.methodFilter = new MethodFilter[filters.length];
             for (int i = 0; i < filters.length; i++) {
                 this.methodFilter[i] = new MethodFilter(filters[i]);
+                // TTY.println(this.methodFilter[i].toString());
             }
         }
         if (GraalOptions.PrintIdealGraphFile) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java	Wed Mar 28 22:14:14 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/MethodFilter.java	Wed Mar 28 22:17:10 2012 +0200
@@ -98,7 +98,7 @@
         if (pattern.contains(".")) {
             return Pattern.compile(createGlobString(pattern));
         } else {
-            return Pattern.compile("([^\\.]\\.])*" + createGlobString(pattern));
+            return Pattern.compile("([^\\.]\\.)*" + createGlobString(pattern));
         }
     }
 
@@ -125,4 +125,22 @@
         return true;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder buf = new StringBuilder("MethodFilter[");
+        String sep = "";
+        if (clazz != null) {
+            buf.append(sep).append("clazz=").append(clazz);
+            sep = ", ";
+        }
+        if (methodName != null) {
+            buf.append(sep).append("methodName=").append(methodName);
+            sep = ", ";
+        }
+        if (signature != null) {
+            buf.append(sep).append("signature=").append(signature);
+            sep = ", ";
+        }
+        return buf.append("]").toString();
+    }
 }