You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by pm...@apache.org on 2011/11/01 14:32:10 UTC
svn commit: r1195990 - in /jakarta/jmeter/trunk:
src/core/org/apache/jmeter/resources/
src/protocol/http/org/apache/jmeter/protocol/http/sampler/ xdocs/
Author: pmouawad
Date: Tue Nov 1 13:32:10 2011
New Revision: 1195990
URL: http://svn.apache.org/viewvc?rev=1195990&view=rev
Log:
Bug 52115 - SOAP/XML-RPC should not send a POST request when file to send is not found
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1195990&r1=1195989&r2=1195990&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Nov 1 13:32:10 2011
@@ -863,6 +863,7 @@ soap_action=Soap Action
soap_data_title=Soap/XML-RPC Data
soap_sampler_title=SOAP/XML-RPC Request
soap_send_action=Send SOAPAction:
+soap_sampler_file_invalid=Filename references a missing or unreadable file\:
spline_visualizer_average=Average
spline_visualizer_incoming=Incoming
spline_visualizer_maximum=Maximum
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1195990&r1=1195989&r2=1195990&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Tue Nov 1 13:32:10 2011
@@ -771,6 +771,7 @@ soap_action=Action Soap
soap_data_title=Donn\u00E9es Soap/XML-RPC
soap_sampler_title=Requ\u00EAte SOAP/XML-RPC
soap_send_action=Envoyer l'action SOAP \:
+soap_sampler_file_invalid=Le nom de fichier r\u00E9f\u00E9rence un fichier absent ou sans droits de lecture\:
spline_visualizer_average=Moyenne \:
spline_visualizer_incoming=Entr\u00E9e \:
spline_visualizer_maximum=Maximum \:
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=1195990&r1=1195989&r2=1195990&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java Tue Nov 1 13:32:10 2011
@@ -27,6 +27,7 @@ import org.apache.jmeter.protocol.http.c
import org.apache.jmeter.protocol.http.control.HeaderManager;
import org.apache.jmeter.protocol.http.util.HTTPConstants;
import org.apache.jmeter.samplers.Interruptible;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -163,6 +164,11 @@ public class SoapSampler extends HTTPSam
StringBuilder postedBody = new StringBuilder(1000);
final String xmlFile = getXmlFile();
if (xmlFile != null && xmlFile.length() > 0) {
+ File xmlFileAsFile = new File(xmlFile);
+ if(!(xmlFileAsFile.exists() && xmlFileAsFile.canRead())) {
+ throw new IllegalArgumentException(JMeterUtils.getResString("soap_sampler_file_invalid") // $NON-NLS-1$
+ + xmlFileAsFile.getAbsolutePath());
+ }
// We just add placeholder text for file content
postedBody.append("Filename: ").append(xmlFile).append("\n");
postedBody.append("<actual file content, not shown here>");
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1195990&r1=1195989&r2=1195990&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Nov 1 13:32:10 2011
@@ -158,6 +158,7 @@ these occurs, Sampler is marked as faile
<li>Bug 51419 - JMS Subscriber: ability to use Selectors</li>
<li>Bug 52088 - JMS Sampler : Add a selector when REQUEST / RESPONSE is chosen</li>
<li>Bug 52104 - TCP Sampler handles badly errors</li>
+<li>Bug 52115 - SOAP/XML-RPC should not send a POST request when file to send is not found</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org