svn commit: r1570092 - in /incubator/sirona/trunk: agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java core/src/main/java/org/apache/sirona/tracking/PathTracker.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb 20 06:58:28 2014
New Revision: 1570092

URL: http://svn.apache.org/r1570092
Log:
cleaning the parhtracker a bit more

Modified:
    incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
    incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java

Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java?rev=1570092&r1=1570091&r2=1570092&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/listener/PathTrackingInvocationListener.java Thu Feb 20 06:58:28 2014
@@ -31,7 +31,6 @@ import org.apache.sirona.tracking.PathTr
 public class PathTrackingInvocationListener extends ConfigurableListener {
 
     private static final Integer PATH_TRACKER_KEY = "Sirona-path-tracker-key".hashCode();
-    private static final Integer PATH_TRACKING_INFO_LEVEL_KEY = "Sirona-path-tracking-info-key".hashCode();
 
     private static final boolean TRACKING_ACTIVATED =
         Configuration.is( Configuration.CONFIG_PROPERTY_PREFIX + "javaagent.path.tracking.activate", false );
@@ -78,13 +77,12 @@ public class PathTrackingInvocationListe
         String methodName = key.substring(lastDot + 1, key.length());
 
         final PathTracker.PathTrackingInformation pathTrackingInformation = new PathTracker.PathTrackingInformation(className, methodName);
-        context.put(PATH_TRACKING_INFO_LEVEL_KEY, pathTrackingInformation);
         context.put(PATH_TRACKER_KEY, PathTracker.start(pathTrackingInformation));
     }
 
     /**
      *
-     * will call {@link org.apache.sirona.tracking.PathTracker#stop(org.apache.sirona.tracking.PathTracker.PathTrackingInformation)}
+     * will call {@link org.apache.sirona.tracking.PathTracker#stop()}
      * @param context
      * @param result
      * @param error
@@ -98,7 +96,6 @@ public class PathTrackingInvocationListe
             System.out.println( "PathTrackingInvocationListener#after: " + context.getKey() );
         }
 
-        context.get(PATH_TRACKER_KEY, PathTracker.class)
-                .stop(context.get(PATH_TRACKING_INFO_LEVEL_KEY, PathTracker.PathTrackingInformation.class));
+        context.get(PATH_TRACKER_KEY, PathTracker.class).stop();
     }
 }

Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java?rev=1570092&r1=1570091&r2=1570092&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/tracking/PathTracker.java Thu Feb 20 06:58:28 2014
@@ -45,6 +45,12 @@ public class PathTracker
         }
     };
 
+    private final PathTrackingInformation pathTrackingInformation;
+
+    public PathTracker(final PathTrackingInformation pathTrackingInformation) {
+        this.pathTrackingInformation = pathTrackingInformation;
+    }
+
     private static class Context {
         private String uuid;
         private AtomicInteger level;
@@ -166,10 +172,10 @@ public class PathTracker
 
         //System.out.println("start level: " + level + " for key " + key);
 
-        return new PathTracker(); // TODO: see if this shouldn't be it which should be in *the* ThreadLocal
+        return new PathTracker(pathTrackingInformation);
     }
 
-    public void stop( PathTrackingInformation pathTrackingInformation )
+    public void stop()
     {
         final long end = System.nanoTime();
         final long start = pathTrackingInformation.getStart();
@@ -197,5 +203,4 @@ public class PathTracker
         }
     }
 
-
 }