Modification of search logic for jit excludes; use "ModuleName" or "M…

…odule#method" or "method" to exclude. JRUBY-2679. git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7200 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · Jul 17, 2008 · 820d598 · 820d598
1 parent 6036154
commit 820d598
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/org/jruby/compiler/JITCompiler.java b/src/org/jruby/compiler/JITCompiler.java
@@ -88,9 +88,10 @@ public void runJIT(final DefaultMethod method, final ThreadContext context, fina
 
                 // Check if the method has been explicitly excluded
                 String moduleName = method.getImplementationClass().getName();
-                moduleName = moduleName.replaceAll("#<.*>", "-");
-                if (instanceConfig.getExcludedMethods().contains(moduleName) ||
-                        instanceConfig.getExcludedMethods().contains(moduleName+"::"+name)) {
+                if (instanceConfig.getExcludedMethods().size() > 0 &&
+                        (instanceConfig.getExcludedMethods().contains(moduleName) ||
+                        instanceConfig.getExcludedMethods().contains(moduleName+"#"+name) ||
+                        instanceConfig.getExcludedMethods().contains(name))) {
                     method.setCallCount(-1);
                     return;
                 }