Author: milamber
Date: Thu Sep 15 23:30:45 2011
New Revision: 1171327
URL: http://svn.apache.org/viewvc?rev=1171327&view=rev
Log:
Bug 51830 - Webservice Soap Request triggers too many popups when Webservice
WSDL URL is down
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java?rev=1171327&r1=1171326&r2=1171327&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
Thu Sep 15 23:30:45 2011
@@ -264,7 +264,7 @@ public class WebServiceSamplerGui extend
wsdlField.setText(sampler.getWsdlURL());
final String wsdlText = wsdlField.getText();
if (wsdlText != null && wsdlText.length() > 0) {
- fillWsdlMethods(wsdlField.getText());
+ fillWsdlMethods(wsdlField.getText(), true);
}
protocol.setText(sampler.getProtocol());
domain.setText(sampler.getDomain());
@@ -318,9 +318,10 @@ public class WebServiceSamplerGui extend
* easily replace it with a different WSDL driver later on.
*
* @param url
+ * @param silent
* @return array of web methods
*/
- public String[] browseWSDL(String url) {
+ public String[] browseWSDL(String url, boolean silent) {
try {
// We get the AuthManager and pass it to the WSDLHelper
// once the sampler is updated to Axis, all of this stuff
@@ -332,11 +333,13 @@ public class WebServiceSamplerGui extend
HELPER.parse();
return HELPER.getWebMethods();
} catch (Exception exception) {
- JOptionPane.showConfirmDialog(this,
- JMeterUtils.getResString("wsdl_helper_error") //
$NON-NLS-1$
- +"\n"+exception, // $NON-NLS-1$
- "Warning",
- JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+ if (!silent) {
+ JOptionPane.showConfirmDialog(this,
+ JMeterUtils.getResString("wsdl_helper_error") //
$NON-NLS-1$
+ +"\n"+exception, // $NON-NLS-1$
+ "Warning",
+ JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+ }
return ArrayUtils.EMPTY_STRING_ARRAY;
}
}
@@ -365,7 +368,7 @@ public class WebServiceSamplerGui extend
} else if (eventSource == wsdlButton){
final String wsdlText = wsdlField.getText();
if (wsdlText != null && wsdlText.length() > 0) {
- fillWsdlMethods(wsdlText);
+ fillWsdlMethods(wsdlText, false);
} else {
JOptionPane.showConfirmDialog(this,
JMeterUtils.getResString("wsdl_url_error"), //
$NON-NLS-1$
@@ -378,8 +381,8 @@ public class WebServiceSamplerGui extend
/**
* @param wsdlText
*/
- private void fillWsdlMethods(final String wsdlText) {
- String[] wsdlData = browseWSDL(wsdlText);
+ private void fillWsdlMethods(final String wsdlText, boolean silent) {
+ String[] wsdlData = browseWSDL(wsdlText, silent);
if (wsdlData != null) {
wsdlMethods.setValues(wsdlData);
wsdlMethods.repaint();
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1171327&r1=1171326&r2=1171327&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Sep 15 23:30:45 2011
@@ -86,6 +86,7 @@ This can be overridden by setting the JM
<ul>
<li>Bug 50424 - Web Methods drop down list box inconsistent</li>
<li>Bug 43293 - Java Request fields not cleared when creating new sampler</li>
+<li>Bug 51830 - Webservice Soap Request triggers too many popups when
Webservice WSDL URL is down</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
