svn commit: r1814645 - in /jmeter/trunk: src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Wed Nov  8 20:59:54 2017
New Revision: 1814645

URL: http://svn.apache.org/viewvc?rev=1814645&view=rev
Log:
Bug 61739 - Java Request / JavaSamplerClient : Improve JavaSamplerContext 
Bugzilla Id: 61739

Modified:
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java?rev=1814645&r1=1814644&r2=1814645&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java Wed Nov  8 20:59:54 2017
@@ -20,9 +20,14 @@ package org.apache.jmeter.protocol.java.
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.java.test.JavaTest;
+import org.apache.jmeter.threads.JMeterContext;
+import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -223,4 +228,27 @@ public class JavaSamplerContext {
             return defaultValue;
         }
     }
+    
+    /**
+     * 
+     * @return {@link JMeterContext}
+     */
+    public JMeterContext getJMeterContext() {
+        return JMeterContextService.getContext();
+    }
+    /**
+     * @return {@link JMeterVariables}
+     */
+    public final JMeterVariables getJMeterVariables() {
+        return JMeterContextService.getContext().getVariables();
+    }
+    
+    /**
+     * 
+     * @return {@link Properties} JMeter properties
+     */
+    public final Properties getJMeterProperties() {
+        return JMeterUtils.getJMeterProperties();
+    }
+    
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814645&r1=1814644&r2=1814645&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Nov  8 20:59:54 2017
@@ -97,6 +97,7 @@ Summary
 
 <h3>Other samplers</h3>
 <ul>
+    <li><bug>61739</bug>Java Request / JavaSamplerClient : Improve <code>org.apache.jmeter.protocol.java.sampler.JavaSamplerContext</code></li>
 </ul>
 
 <h3>Controllers</h3>