You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/08 05:27:35 UTC
svn commit: r354974 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/client/Options.java
core/src/org/apache/axis2/transport/jms/JMSSender.java
integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
Author: dims
Date: Wed Dec 7 20:27:21 2005
New Revision: 354974
URL: http://svn.apache.org/viewcvs?rev=354974&view=rev
Log:
bump up the default timeout a bit more, use default timeout in jms, use the correct key to look in message context
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=354974&r1=354973&r2=354974&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Wed Dec 7 20:27:21 2005
@@ -80,7 +80,7 @@
// ==========================================================================
public static final String COPY_PROPERTIES = "CopyProperties";
- private static final int DEFAULT_TIMEOUT_MILLISECONDS = 2000;
+ public static final int DEFAULT_TIMEOUT_MILLISECONDS = 5000;
// ==========================================================================
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=354974&r1=354973&r2=354974&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java Wed Dec 7 20:27:21 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.client.Options;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMOutputFormat;
@@ -137,7 +138,10 @@
props.put("contentType", getContentType(msgContext));
props.put("SOAPAction", getSOAPAction(msgContext));
if (waitForResponse) {
- long timeout = ((Long) msgContext.getProperty(JMSConstants._TIMEOUT_TIME)).longValue();
+ long timeout = Options.DEFAULT_TIMEOUT_MILLISECONDS;
+ if(msgContext.getProperty(JMSConstants.TIMEOUT_TIME) != null) {
+ timeout = ((Long) msgContext.getProperty(JMSConstants.TIMEOUT_TIME)).longValue();
+ }
byte[] response = endpoint.call(out.toByteArray(), timeout, props);
InputStream in = new ByteArrayInputStream(response);
msgContext.setProperty(MessageContext.TRANSPORT_IN, in);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=354974&r1=354973&r2=354974&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Wed Dec 7 20:27:21 2005
@@ -115,7 +115,6 @@
options.setAction(serviceName.getLocalPart());
options.setSoapAction("echoOMElement");
options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
- options.getProperties().put(JMSConstants._TIMEOUT_TIME, new Long(100000));
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
@@ -166,7 +165,6 @@
options.setAction(serviceName.getLocalPart());
options.setSoapAction("EchoXMLService/echoOMElement");
options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
- options.getProperties().put(JMSConstants._TIMEOUT_TIME, new Long(100000));
OMElement result =
call.invokeBlocking(operationName.getLocalPart(),
@@ -200,7 +198,6 @@
options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
options.setSoapAction("EchoXMLService/echoOMElement");
options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.FALSE);
- options.getProperties().put(JMSConstants._TIMEOUT_TIME, new Long(100000));
options.setUseSeparateListener(true);
OMElement result = call.invokeBlocking(
@@ -224,7 +221,6 @@
options.setListenerTransportProtocol(Constants.TRANSPORT_JMS);
options.setSoapAction("EchoXMLService/echoOMElement");
options.getProperties().put(JMSConstants.WAIT_FOR_RESPONSE, Boolean.TRUE);
- options.getProperties().put(JMSConstants._TIMEOUT_TIME, new Long(100000));
OMFactory fac = OMAbstractFactory.getOMFactory();