You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2014/02/23 23:11:46 UTC
svn commit: r1571107 - in /incubator/sirona/trunk:
agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java
core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
Author: rmannibucau
Date: Sun Feb 23 22:11:46 2014
New Revision: 1571107
URL: http://svn.apache.org/r1571107
Log:
wrong variable + removing copy of agentParameters to avoid to create a bunch of useless instances
Modified:
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java?rev=1571107&r1=1571106&r2=1571107&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/AgentContext.java Sun Feb 23 22:11:46 2014
@@ -44,10 +44,10 @@ public class AgentContext {
private static final ConcurrentMap<String, Counter.Key> KEYS_CACHE = new ConcurrentHashMap<String, Counter.Key>();
private static final AgentContext FAKE_CONTEXT = new AgentContext("init", null, new InvocationListener[0]);
- private static Map<String, String> agentParameters = new HashMap<String, String>( );
+ private static final Map<String, String> AGENT_PARAMETERS = new ConcurrentHashMap<String, String>();
public static void addAgentParameter( String key, String value){
- agentParameters.put( key, value );
+ AGENT_PARAMETERS.put(key, value);
}
/**
@@ -55,7 +55,7 @@ public class AgentContext {
* @return a copy of the Agent parameters
*/
public static Map<String,String> getAgentParameters(){
- return new HashMap<String, String>( agentParameters );
+ return AGENT_PARAMETERS;
}
// called by agent
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java?rev=1571107&r1=1571106&r2=1571107&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java Sun Feb 23 22:11:46 2014
@@ -128,9 +128,7 @@ public final class PredicateEvaluator {
|| apache.startsWith("activemq") || apache.startsWith("commons")) {
return true;
}
- } else if (org.startsWith("slf4j.") || org.startsWith("metatype") || org.startsWith("hsqldb")) {
- return true;
- } else if (value.startsWith("eclipse.jdt")) {
+ } else if (org.startsWith("slf4j.") || org.startsWith("metatype") || org.startsWith("hsqldb") || org.startsWith("eclipse.jdt")) {
return true;
}
} else if (value.startsWith("serp")) {
@@ -144,7 +142,7 @@ public final class PredicateEvaluator {
if (isTomcat(sub)) {
return true;
}
- } else if (value.startsWith("eclipse.jdt")) {
+ } else if (org.startsWith("eclipse.jdt")) {
return true;
}
}