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 2015/11/12 04:24:46 UTC

svn commit: r1713965 - in /incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent: AgentArgs.java JavaAgentRunner.java

Author: rmannibucau
Date: Thu Nov 12 03:24:46 2015
New Revision: 1713965

URL: http://svn.apache.org/viewvc?rev=1713965&view=rev
Log:
defaulting AgentArgs.value

Modified:
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java?rev=1713965&r1=1713964&r2=1713965&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java Thu Nov 12 03:24:46 2015
@@ -33,7 +33,7 @@ public @interface AgentArgs
 
     boolean removeSironaFromClasspath() default true;
 
-    String value();
+    String value() default "";
 
     String maxMem() default "";
 

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java?rev=1713965&r1=1713964&r2=1713965&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java Thu Nov 12 03:24:46 2015
@@ -155,7 +155,7 @@ public class JavaAgentRunner extends Blo
         }
 
         String javaAgentArgs =
-                agentArgs == null ? null : StrSubstitutor.replace(agentArgs.value(), System.getProperties());
+                agentArgs == null || agentArgs.value().isEmpty() ? null : StrSubstitutor.replace(agentArgs.value(), System.getProperties());
         args.add("-javaagent:" + buildJavaagent() + "=" + (javaAgentArgs == null ? "" : javaAgentArgs));
 
         if (Boolean.getBoolean("test.debug.remote")) {