Author: sebb
Date: Sun Oct 21 17:27:57 2007
New Revision: 586978

URL: http://svn.apache.org/viewvc?rev=586978&view=rev
Log:
Move setProperty() action to StandardJMeterEngine as that is where the other 
actions are handled

Modified:
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=586978&r1=586977&r2=586978&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java 
Sun Oct 21 17:27:57 2007
@@ -80,6 +80,7 @@
        }
 
        public void stopTest() {
+               log.info("about to stop remote test on "+host);
                try {
                        remote.stopTest();
                } catch (Exception ex) {
@@ -134,6 +135,7 @@
         * @see org.apache.jmeter.engine.JMeterEngine#exit()
         */
        public void exit() {
+               log.info("about to exit remote server on "+host);
                try {
                        remote.exit();
                } catch (RemoteException e) {

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=586978&r1=586977&r2=586978&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
 Sun Oct 21 17:27:57 2007
@@ -126,7 +126,6 @@
        }
 
        public void setProperties(Properties p) throws RemoteException {
-               log.info("Applying properties "+p);
-               JMeterUtils.getJMeterProperties().putAll(p);
+               backingEngine.setProperties(p);
        }
 }

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=586978&r1=586977&r2=586978&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 Sun Oct 21 17:27:57 2007
@@ -544,6 +544,7 @@
        }
 
        public void setProperties(Properties p) {
-               //not needed locally
+               log.info("Applying properties "+p);
+               JMeterUtils.getJMeterProperties().putAll(p);
        }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to