svn commit: r1840762 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[sebb]

Author: sebb
Date: Wed Sep 12 21:52:19 2018
New Revision: 1840762

URL: http://svn.apache.org/viewvc?rev=1840762&view=rev
Log:
Fix up log messages to show correct information; use better name for variable 
which only applies to Groovy; fix typo

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1840762&r1=1840761&r2=1840762&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Sep 12 21:52:19 2018
@@ -675,10 +675,10 @@ public class JMeter implements JMeterPlu
         }
         
         // Should we run a Groovy script on startup?
-        String jsr223Init = JMeterUtils.getProperty("groovy.init.file");// 
$NON-NLS-1$
-        if (jsr223Init != null){
-            log.info("Running Groovy init script in file: {}", jsr223Init);
-            File file = new File(jsr223Init);
+        String groovyInit = JMeterUtils.getProperty("groovy.init.file");// 
$NON-NLS-1$
+        if (groovyInit != null){
+            log.info("Running Groovy init script in file: {}", groovyInit);
+            File file = new File(groovyInit);
             if(file.exists() && file.canRead()) {
                 try (FileReader reader = new FileReader(file)) {
                     ScriptEngineManager scriptEngineManager = new 
ScriptEngineManager();
@@ -692,10 +692,10 @@ public class JMeter implements JMeterPlu
                     bindings.put("OUT", System.out); // NOSONAR $NON-NLS-1$ 
(this name is fixed)
                     engine.eval(reader, bindings);
                 } catch (IOException | ScriptException ex) {
-                    log.error("Error running init script referenced by 
property {}", jsr223Init, ex);
+                    log.error("Error running init script {}: {}", groovyInit, 
ex);
                 }
             } else {
-                log.error("Script {} referenced by property {} is not 
readable or does not exists", file.getAbsolutePath(), jsr223Init);
+                log.error("Script {} referenced by property {} is not 
readable or does not exist", file.getAbsolutePath(), "groovy.init.file");
             }
         }
     }