svn commit: r943965 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java

[dblevins]

Author: dblevins
Date: Thu May 13 18:20:01 2010
New Revision: 943965

URL: http://svn.apache.org/viewvc?rev=943965&view=rev
Log:
Tweaked regexes so 'get()' methods aren't counted as operations
OPENEJB-1275 OPENEJB-1273 OPENEJB-1272

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java?rev=943965&r1=943964&r2=943965&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
 Thu May 13 18:20:01 2010
@@ -133,7 +133,7 @@ public class ManagedMBean implements Dyn
         List<Method> managed = finder.findAnnotatedMethods(Managed.class);
         for (Method method : managed) {
             MethodMember member = new MethodMember(method, target, prefix);
-            if (!method.getName().matches("(get|is)[A-Z_].*")) {
+            if (!method.getName().matches("(get|is)([A-Z_].*|)")) {
                 operationsMap.put(member.getName(), member);
             } else {
                 attribute(new MethodMember(method, target, prefix));
@@ -338,10 +338,10 @@ public class ManagedMBean implements Dyn
             String method = getter.getName();
 
             StringBuilder name = new StringBuilder(method);
-
+            
             // remove 'get'
-            if (method.matches("get[A-Z].*")) name.delete(0, 3);
-            if (method.matches("is[A-Z].*")) name.delete(0, 2);
+            if (method.matches("get([A-Z].*|)")) name.delete(0, 3);
+            if (method.matches("is([A-Z].*|)")) name.delete(0, 2);
 
             if (!"".equals(prefix)) {
                 if (!"".equals(name.toString())) name.insert(0, ".");