svn commit: r1529171 - in /jmeter/trunk: src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java xdocs/changes.xml

[se...@apache.org]

Author: sebb
Date: Fri Oct  4 14:43:01 2013
New Revision: 1529171

URL: http://svn.apache.org/r1529171
Log:
Invalid/unexpected configuration values should not be silently ignored
Log warning for jmeter.save.saveservice.output_format
Bugzilla Id: 55623

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=1529171&r1=1529170&r2=1529171&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java Fri Oct  4 14:43:01 2013
@@ -30,7 +30,9 @@ import org.apache.commons.lang3.CharUtil
 import org.apache.jmeter.save.CSVSaveService;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
 import org.apache.jorphan.util.JMeterError;
+import org.apache.log.Logger;
 
 /*
  * N.B. to add a new field, remember the following
@@ -63,6 +65,8 @@ import org.apache.jorphan.util.JMeterErr
 public class SampleSaveConfiguration implements Cloneable, Serializable {
     private static final long serialVersionUID = 7L;
 
+    private static final Logger log = LoggingManager.getLoggerForClass();
+
     // ---------------------------------------------------------------------
     // PROPERTY FILE CONSTANTS
     // ---------------------------------------------------------------------
@@ -383,6 +387,9 @@ public class SampleSaveConfiguration imp
         if (XML.equals(howToSave)) {
             _xml = true;
         } else {
+            if (!CSV.equals(howToSave)) {
+                log.warn(OUTPUT_FORMAT_PROP + " has unexepected value: '" + howToSave + "' - assuming 'csv' format");
+            }
             _xml = false;
         }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1529171&r1=1529170&r2=1529171&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Oct  4 14:43:01 2013
@@ -488,6 +488,7 @@ To revert to previous behaviour, set the
 <li><bugzilla>55486</bugzilla> - New JMeter Logo. Contributed by UBIK Load Pack (support at ubikloadpack.com)</li>
 <li><bugzilla>55548</bugzilla> - Tidy up use of TestElement.ENABLED; use TestElement.isEnabled()/setEnabled() throughout</li>
 <li><bugzilla>55617</bugzilla> - Improvements to jorphan collection. Contributed by Benoit Wiart (benoit.wiart at gmail.com)</li>
+<li><bugzilla>55623</bugzilla> - Invalid/unexpected configuration values should not be silently ignored</li>
 </ul>
 
 <h2>Thanks</h2>