svn commit: r1519417 - /commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java

[jlmonteiro]

Author: jlmonteiro
Date: Mon Sep  2 12:32:17 2013
New Revision: 1519417

URL: http://svn.apache.org/r1519417
Log:
Fix the default NameExtractor implementation so that it does not fail with a 
NPE if the pointcut is on a static method.

Modified:
    
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java

Modified: 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java?rev=1519417&r1=1519416&r2=1519417&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java
 (original)
+++ 
commons/sandbox/monitoring/trunk/aop/src/main/java/org/apache/commons/monitoring/aop/DefaultMonitorNameExtractor.java
 Mon Sep  2 12:32:17 2013
@@ -31,7 +31,11 @@ public class DefaultMonitorNameExtractor
     }
 
     public String getMonitorName(final Object instance, final Method method) {
-        return instance.getClass().getName() + "." + method.getName();
+        if (instance == null) { // static method
+            return method.getDeclaringClass().getName() + "." + 
method.getName();
+        } else {
+            return instance.getClass().getName() + "." + method.getName();
+        }
     }
 
 }