Author: jochen
Date: Fri Oct 6 14:08:08 2006
New Revision: 453764
URL: http://svn.apache.org/viewvc?view=rev&rev=453764
Log:
The method TimingOutCallback.waitForResponse is now checking, whether
a response has already arrived before waiting.
Submitted-By: Jonathan Oexner, [EMAIL PROTECTED]
Modified:
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/pom.xml
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/src/changes/changes.xml
webservices/xmlrpc/trunk/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
webservices/xmlrpc/trunk/pom.xml
webservices/xmlrpc/trunk/src/changes/changes.xml
Modified:
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
---
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
(original)
+++
webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
Fri Oct 6 14:08:08 2006
@@ -53,9 +53,11 @@
* @throws Throwable An error was returned by the server.
*/
public synchronized Object waitForResponse() throws Throwable {
- wait(timeout);
if (!responseSeen) {
- throw new TimeoutException(0, "No response after waiting for " +
timeout + " milliseconds.");
+ wait(timeout);
+ if (!responseSeen) {
+ throw new TimeoutException(0, "No response after waiting for "
+ timeout + " milliseconds.");
+ }
}
if (error != null) {
throw error;
Modified: webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/pom.xml?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
--- webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/pom.xml (original)
+++ webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/pom.xml Fri Oct 6 14:08:08
2006
@@ -161,6 +161,10 @@
<name>Walter Mundt</name>
<email>[EMAIL PROTECTED]</email>
</contributor>
+ <contributor>
+ <name>Jonathan Oexner</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
<contributor>
<name>Mark Petrovic</name>
<email>[EMAIL PROTECTED]</email>
Modified: webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/src/changes/changes.xml?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
--- webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/src/changes/changes.xml
(original)
+++ webservices/xmlrpc/branches/XMLRPC_3_0_BRANCH/src/changes/changes.xml Fri
Oct 6 14:08:08 2006
@@ -31,6 +31,11 @@
<action dev="jochen" type="fix" issue="XMLRPC-115">
An NPE was thrown, if the clients request didn't contain a "params"
element.
</action>
+ <action dev="jochen" type="fix" due-to="Jonathan Oexner"
+ due-to-email="[EMAIL PROTECTED]">
+ The method TimingOutCallback.waitForResponse is now checking, whether
+ a response has already arrived before waiting.
+ </action>
</release>
<release version="3.0" date="30-Aug-2006">
<action dev="jochen" type="fix" due-to="Matt Preston"
Modified:
webservices/xmlrpc/trunk/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/trunk/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
---
webservices/xmlrpc/trunk/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
(original)
+++
webservices/xmlrpc/trunk/client/src/main/java/org/apache/xmlrpc/client/TimingOutCallback.java
Fri Oct 6 14:08:08 2006
@@ -53,9 +53,11 @@
* @throws Throwable An error was returned by the server.
*/
public synchronized Object waitForResponse() throws Throwable {
- wait(timeout);
if (!responseSeen) {
- throw new TimeoutException(0, "No response after waiting for " +
timeout + " milliseconds.");
+ wait(timeout);
+ if (!responseSeen) {
+ throw new TimeoutException(0, "No response after waiting for "
+ timeout + " milliseconds.");
+ }
}
if (error != null) {
throw error;
Modified: webservices/xmlrpc/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/trunk/pom.xml?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
--- webservices/xmlrpc/trunk/pom.xml (original)
+++ webservices/xmlrpc/trunk/pom.xml Fri Oct 6 14:08:08 2006
@@ -166,6 +166,10 @@
<email>[EMAIL PROTECTED]</email>
</contributor>
<contributor>
+ <name>Jonathan Oexner</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
+ <contributor>
<name>Mark Petrovic</name>
<email>[EMAIL PROTECTED]</email>
</contributor>
Modified: webservices/xmlrpc/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlrpc/trunk/src/changes/changes.xml?view=diff&rev=453764&r1=453763&r2=453764
==============================================================================
--- webservices/xmlrpc/trunk/src/changes/changes.xml (original)
+++ webservices/xmlrpc/trunk/src/changes/changes.xml Fri Oct 6 14:08:08 2006
@@ -53,6 +53,11 @@
<action dev="jochen" type="fix" issue="XMLRPC-115">
An NPE was thrown, if the clients request didn't contain a "params"
element.
</action>
+ <action dev="jochen" type="fix" due-to="Jonathan Oexner"
+ due-to-email="[EMAIL PROTECTED]">
+ The method TimingOutCallback.waitForResponse is now checking, whether
+ a response has already arrived before waiting.
+ </action>
</release>
<release version="3.0" date="30-Aug-2006">
<action dev="jochen" type="fix" due-to="Matt Preston"
