jochen 2005/05/14 14:17:49
Modified: src/java/org/apache/xmlrpc/client Tag: b20050512_streaming
XmlRpcStreamTransport.java XmlRpcHttpTransport.java
XmlRpcClient.java XmlRpcLocalTransport.java
src/test/org/apache/xmlrpc/test Tag: b20050512_streaming
SerializerTest.java
src/java/org/apache/xmlrpc/util Tag: b20050512_streaming
ThreadPool.java
src/java/org/apache/xmlrpc/webserver Tag:
b20050512_streaming WebServer.java Connection.java
src/java/org/apache/xmlrpc/server Tag: b20050512_streaming
XmlRpcStreamServer.java
. Tag: b20050512_streaming .classpath
Added: src/java/org/apache/xmlrpc/client Tag: b20050512_streaming
XmlRpcSunHttpTransportFactory.java
XmlRpcCommonsTransport.java
XmlRpcSunHttpTransport.java
XmlRpcCommonsTransportFactory.java
src/test/org/apache/xmlrpc/test Tag: b20050512_streaming
SunHttpTransportProvider.java
ClientProviderImpl.java ClientProvider.java
BaseTest.java BaseTest.properties
CommonsProvider.java
LocalStreamTransportProvider.java
WebServerProvider.java LocalTransportProvider.java
Removed: src/java/org/apache/xmlrpc/client Tag: b20050512_streaming
XmlRpcHttpTransportFactory.java
src/test/org/apache/xmlrpc/test Tag: b20050512_streaming
LocalTransportTest.java
LocalStreamTransportTest.java BaseTestCase.java
BaseTestCase.properties HttpTransportTest.java
Log:
Ported the Jakarta Commons httpclient transport. Reworked JUnit framework, so
that one test case can now be used with various transports.
Revision Changes Path
No revision
No revision
1.1.2.4 +0 -1
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcStreamTransport.java
Index: XmlRpcStreamTransport.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcStreamTransport.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XmlRpcStreamTransport.java 13 May 2005 21:06:37 -0000 1.1.2.3
+++ XmlRpcStreamTransport.java 14 May 2005 21:17:48 -0000 1.1.2.4
@@ -215,7 +215,6 @@
} catch (IOException e) {
throw new XmlRpcClientException(e.getMessage(),
e);
}
- System.out.println("Input: " + new
String(baos.toByteArray()));
pStream = new ByteArrayInputStream(baos.toByteArray());
}
1.1.2.3 +14 -66
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcHttpTransport.java
Index: XmlRpcHttpTransport.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcHttpTransport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XmlRpcHttpTransport.java 13 May 2005 21:06:37 -0000 1.1.2.2
+++ XmlRpcHttpTransport.java 14 May 2005 21:17:48 -0000 1.1.2.3
@@ -1,32 +1,25 @@
package org.apache.xmlrpc.client;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URLConnection;
import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
import org.apache.xmlrpc.util.HttpUtil;
-/** Default implementation of an HTTP transport, based on the
- * [EMAIL PROTECTED] java.net.HttpURLConnection} class.
+/** Abstract base implementation of an HTTP transport. Base class for the
+ * concrete implementations, like [EMAIL PROTECTED]
org.apache.xmlrpc.client.XmlRpcSunHttpTransport},
+ * or [EMAIL PROTECTED] org.apache.xmlrpc.client.XmlRpcCommonsTransport}.
*/
-public class XmlRpcHttpTransport extends XmlRpcStreamTransport {
- /** Creates a new instance.
- * @param pClient The client controlling this instance.
- * @param pFactory The factory creating this instance on behalf of the
client.
+public abstract class XmlRpcHttpTransport extends XmlRpcStreamTransport {
+ /** The user agent string.
*/
- public XmlRpcHttpTransport(XmlRpcClient pClient,
XmlRpcHttpTransportFactory pFactory) {
+ public static final String USER_AGENT = "Apache XML RPC 3.0";
+
+ protected XmlRpcHttpTransport(XmlRpcClient pClient,
XmlRpcTransportFactoryImpl pFactory) {
super(pClient, pFactory);
}
- protected void setRequestHeader(Object pConnection, String pHeader,
String pValue) {
- URLConnection conn = (URLConnection) pConnection;
- conn.setRequestProperty(pHeader, pValue);
- }
+ protected abstract void setRequestHeader(Object pConnection, String
pHeader, String pValue);
protected void setCredentials(XmlRpcHttpClientConfig pConfig, Object
pConnection)
throws XmlRpcClientException {
@@ -52,61 +45,16 @@
}
}
- protected Object newConnection(XmlRpcStreamRequestConfig pConfig)
throws XmlRpcClientException {
- XmlRpcHttpClientConfig config = (XmlRpcHttpClientConfig)
pConfig;
- try {
- URLConnection result =
config.getServerURL().openConnection();
- result.setUseCaches(false);
- result.setDoInput(true);
- result.setDoOutput(true);
- return result;
- } catch (IOException e) {
- throw new XmlRpcClientException("Failed to create HTTP
connection object", e);
- }
- }
-
- protected void closeConnection(Object pConnection) throws
XmlRpcClientException {
- if (pConnection instanceof HttpURLConnection) {
- ((HttpURLConnection) pConnection).disconnect();
- }
- }
-
- protected OutputStream newOutputStream(XmlRpcStreamRequestConfig
pConfig, Object pConnection)
- throws XmlRpcClientException {
- try {
- return ((URLConnection) pConnection).getOutputStream();
- } catch (IOException e) {
- throw new XmlRpcClientException("Failed to obtain
output stream to server", e);
- }
- }
-
- protected InputStream newInputStream(XmlRpcStreamRequestConfig pConfig,
Object pConnection)
- throws XmlRpcClientException {
- try {
- return ((URLConnection) pConnection).getInputStream();
- } catch (IOException e) {
- throw new XmlRpcClientException("Failed to obtain input
stream from server", e);
- }
- }
-
- protected void setContentType(XmlRpcHttpClientConfig pConfig, Object
pConnection) throws XmlRpcClientException {
- setRequestHeader(pConnection, "Content-Type", "text/html");
- }
+ protected String getUserAgent() { return USER_AGENT; }
protected void initConnection(XmlRpcStreamRequestConfig pConfig, Object
pConnection) throws XmlRpcClientException {
super.initConnection(pConfig, pConnection);
XmlRpcHttpClientConfig config = (XmlRpcHttpClientConfig)
pConfig;
- setContentType(config, pConnection);
+ setRequestHeader(pConnection, "Content-Type", "text/html");
+ setRequestHeader(pConnection, "User-Agent", getUserAgent());
setCredentials(config, pConnection);
setCompressionHeaders(config, pConnection);
}
- protected boolean isResponseGzipCompressed(XmlRpcStreamRequestConfig
pConfig, Object pConnection) {
- if (pConnection instanceof HttpURLConnection) {
- HttpURLConnection conn = (HttpURLConnection)
pConnection;
- return
HttpUtil.isUsingGzipEncoding(conn.getHeaderField("Content-Encoding"));
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
+ protected abstract boolean
isResponseGzipCompressed(XmlRpcStreamRequestConfig pConfig, Object pConnection);
+}
1.1.2.2 +1 -1
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcClient.java
Index: XmlRpcClient.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcClient.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XmlRpcClient.java 12 May 2005 01:58:51 -0000 1.1.2.1
+++ XmlRpcClient.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -48,7 +48,7 @@
* @since 3.0
*/
public class XmlRpcClient extends XmlRpcController {
- private XmlRpcTransportFactory transportFactory = new
XmlRpcHttpTransportFactory(this);
+ private XmlRpcTransportFactory transportFactory = new
XmlRpcSunHttpTransportFactory(this);
private XmlRpcClientConfig config = new XmlRpcClientConfigImpl();
private XmlWriterFactory xmlWriterFactory = new
DefaultXMLWriterFactory();
1.1.2.2 +19 -3
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcLocalTransport.java
Index: XmlRpcLocalTransport.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcLocalTransport.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XmlRpcLocalTransport.java 12 May 2005 01:58:51 -0000 1.1.2.1
+++ XmlRpcLocalTransport.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -15,6 +15,7 @@
*/
package org.apache.xmlrpc.client;
+import java.util.Iterator;
import java.util.Map;
import org.apache.xmlrpc.XmlRpcConfig;
@@ -35,13 +36,28 @@
private boolean isExtensionType(Object pObject) {
if (pObject == null) {
return true;
+ } else if (pObject instanceof Object[]) {
+ Object[] objects = (Object[]) pObject;
+ for (int i = 0; i < objects.length; i++) {
+ if (isExtensionType(objects[i])) {
+ return true;
+ }
+ }
+ return false;
+ } else if (pObject instanceof Map) {
+ Map map = (Map) pObject;
+ for (Iterator iter = map.entrySet().iterator();
iter.hasNext(); ) {
+ Map.Entry entry = (Map.Entry) iter.next();
+ if (isExtensionType(entry.getKey()) ||
isExtensionType(entry.getValue())) {
+ return true;
+ }
+ }
+ return false;
} else {
return !(pObject instanceof Integer
|| pObject instanceof String
|| pObject instanceof byte[]
- || pObject instanceof Object[]
- || pObject instanceof Double
- || pObject instanceof Map);
+ || pObject instanceof Double);
}
}
No revision
Index: XmlRpcLocalTransport.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcLocalTransport.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XmlRpcLocalTransport.java 12 May 2005 01:58:51 -0000 1.1.2.1
+++ XmlRpcLocalTransport.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -15,6 +15,7 @@
*/
package org.apache.xmlrpc.client;
+import java.util.Iterator;
import java.util.Map;
import org.apache.xmlrpc.XmlRpcConfig;
@@ -35,13 +36,28 @@
private boolean isExtensionType(Object pObject) {
if (pObject == null) {
return true;
+ } else if (pObject instanceof Object[]) {
+ Object[] objects = (Object[]) pObject;
+ for (int i = 0; i < objects.length; i++) {
+ if (isExtensionType(objects[i])) {
+ return true;
+ }
+ }
+ return false;
+ } else if (pObject instanceof Map) {
+ Map map = (Map) pObject;
+ for (Iterator iter = map.entrySet().iterator();
iter.hasNext(); ) {
+ Map.Entry entry = (Map.Entry) iter.next();
+ if (isExtensionType(entry.getKey()) ||
isExtensionType(entry.getValue())) {
+ return true;
+ }
+ }
+ return false;
} else {
return !(pObject instanceof Integer
|| pObject instanceof String
|| pObject instanceof byte[]
- || pObject instanceof Object[]
- || pObject instanceof Double
- || pObject instanceof Map);
+ || pObject instanceof Double);
}
}
No revision
Index: XmlRpcLocalTransport.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcLocalTransport.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XmlRpcLocalTransport.java 12 May 2005 01:58:51 -0000 1.1.2.1
+++ XmlRpcLocalTransport.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -15,6 +15,7 @@
*/
package org.apache.xmlrpc.client;
+import java.util.Iterator;
import java.util.Map;
import org.apache.xmlrpc.XmlRpcConfig;
@@ -35,13 +36,28 @@
private boolean isExtensionType(Object pObject) {
if (pObject == null) {
return true;
+ } else if (pObject instanceof Object[]) {
+ Object[] objects = (Object[]) pObject;
+ for (int i = 0; i < objects.length; i++) {
+ if (isExtensionType(objects[i])) {
+ return true;
+ }
+ }
+ return false;
+ } else if (pObject instanceof Map) {
+ Map map = (Map) pObject;
+ for (Iterator iter = map.entrySet().iterator();
iter.hasNext(); ) {
+ Map.Entry entry = (Map.Entry) iter.next();
+ if (isExtensionType(entry.getKey()) ||
isExtensionType(entry.getValue())) {
+ return true;
+ }
+ }
+ return false;
} else {
return !(pObject instanceof Integer
|| pObject instanceof String
|| pObject instanceof byte[]
- || pObject instanceof Object[]
- || pObject instanceof Double
- || pObject instanceof Map);
+ || pObject instanceof Double);
}
}
1.1.2.1 +36 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcSunHttpTransportFactory.java
1.1.2.1 +119 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcCommonsTransport.java
1.1.2.1 +77 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcSunHttpTransport.java
1.1.2.1 +36 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/client/Attic/XmlRpcCommonsTransportFactory.java
No revision
No revision
1.1.2.3 +2 -5
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/SerializerTest.java
Index: SerializerTest.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/SerializerTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SerializerTest.java 13 May 2005 21:06:37 -0000 1.1.2.2
+++ SerializerTest.java 14 May 2005 21:17:48 -0000 1.1.2.3
@@ -27,15 +27,12 @@
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.XmlRpcClientRequestImpl;
-import org.apache.xmlrpc.client.XmlRpcHttpTransportFactory;
+import org.apache.xmlrpc.client.XmlRpcSunHttpTransportFactory;
import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
import org.apache.xmlrpc.serializer.XmlRpcWriter;
import org.apache.xmlrpc.util.Base64;
import org.xml.sax.SAXException;
-import sun.misc.BASE64Encoder;
-
-import junit.framework.ComparisonFailure;
import junit.framework.TestCase;
@@ -48,7 +45,7 @@
*/
public SerializerTest() {
client = new XmlRpcClient();
- client.setTransportFactory(new
XmlRpcHttpTransportFactory(client));
+ client.setTransportFactory(new
XmlRpcSunHttpTransportFactory(client));
}
protected XmlRpcClientConfigImpl getConfig() {
No revision
Index: SerializerTest.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/SerializerTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SerializerTest.java 13 May 2005 21:06:37 -0000 1.1.2.2
+++ SerializerTest.java 14 May 2005 21:17:48 -0000 1.1.2.3
@@ -27,15 +27,12 @@
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.XmlRpcClientRequestImpl;
-import org.apache.xmlrpc.client.XmlRpcHttpTransportFactory;
+import org.apache.xmlrpc.client.XmlRpcSunHttpTransportFactory;
import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
import org.apache.xmlrpc.serializer.XmlRpcWriter;
import org.apache.xmlrpc.util.Base64;
import org.xml.sax.SAXException;
-import sun.misc.BASE64Encoder;
-
-import junit.framework.ComparisonFailure;
import junit.framework.TestCase;
@@ -48,7 +45,7 @@
*/
public SerializerTest() {
client = new XmlRpcClient();
- client.setTransportFactory(new
XmlRpcHttpTransportFactory(client));
+ client.setTransportFactory(new
XmlRpcSunHttpTransportFactory(client));
}
protected XmlRpcClientConfigImpl getConfig() {
No revision
Index: SerializerTest.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/SerializerTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SerializerTest.java 13 May 2005 21:06:37 -0000 1.1.2.2
+++ SerializerTest.java 14 May 2005 21:17:48 -0000 1.1.2.3
@@ -27,15 +27,12 @@
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.apache.xmlrpc.client.XmlRpcClientRequestImpl;
-import org.apache.xmlrpc.client.XmlRpcHttpTransportFactory;
+import org.apache.xmlrpc.client.XmlRpcSunHttpTransportFactory;
import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
import org.apache.xmlrpc.serializer.XmlRpcWriter;
import org.apache.xmlrpc.util.Base64;
import org.xml.sax.SAXException;
-import sun.misc.BASE64Encoder;
-
-import junit.framework.ComparisonFailure;
import junit.framework.TestCase;
@@ -48,7 +45,7 @@
*/
public SerializerTest() {
client = new XmlRpcClient();
- client.setTransportFactory(new
XmlRpcHttpTransportFactory(client));
+ client.setTransportFactory(new
XmlRpcSunHttpTransportFactory(client));
}
protected XmlRpcClientConfigImpl getConfig() {
1.1.2.1 +40 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/SunHttpTransportProvider.java
1.1.2.1 +56 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/ClientProviderImpl.java
1.1.2.1 +36 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/ClientProvider.java
1.1.2.1 +704 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/BaseTest.java
1.1.2.1 +1 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/BaseTest.properties
1.1.2.1 +23 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/CommonsProvider.java
1.1.2.1 +39 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/LocalStreamTransportProvider.java
1.1.2.1 +61 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/WebServerProvider.java
1.1.2.1 +46 -0
ws-xmlrpc/src/test/org/apache/xmlrpc/test/Attic/LocalTransportProvider.java
No revision
No revision
1.1.2.2 +1 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/util/Attic/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/util/Attic/ThreadPool.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ThreadPool.java 12 May 2005 01:58:53 -0000 1.1.2.1
+++ ThreadPool.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -38,6 +38,7 @@
private Task task;
MyThread() {
super(threadGroup, threadGroup.getName() + "-" + num++);
+ setDaemon(true);
}
synchronized void shutdown() {
shuttingDown = true;
No revision
No revision
1.1.2.3 +2 -2
ws-xmlrpc/src/java/org/apache/xmlrpc/webserver/Attic/WebServer.java
Index: WebServer.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/webserver/Attic/WebServer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WebServer.java 13 May 2005 21:06:37 -0000 1.1.2.2
+++ WebServer.java 14 May 2005 21:17:48 -0000 1.1.2.3
@@ -290,7 +290,7 @@
// Timeout while waiting for a client
(from
// SO_TIMEOUT)...try again if still
listening.
} catch (Throwable t) {
- t.printStackTrace();
+ log(t);
}
}
} finally {
@@ -298,7 +298,7 @@
try {
serverSocket.close();
} catch (IOException e) {
- e.printStackTrace();
+ log(e);
}
}
1.1.2.2 +11 -4
ws-xmlrpc/src/java/org/apache/xmlrpc/webserver/Attic/Connection.java
Index: Connection.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/webserver/Attic/Connection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Connection.java 12 May 2005 01:58:53 -0000 1.1.2.1
+++ Connection.java 14 May 2005 21:17:48 -0000 1.1.2.2
@@ -101,7 +101,7 @@
* @return The connections request configuration.
* @throws IOException Reading the request headers failed.
*/
- public RequestData getRequestConfig() throws IOException {
+ private RequestData getRequestConfig() throws IOException {
RequestData result = new RequestData(this);
XmlRpcHttpServerConfig serverConfig = (XmlRpcHttpServerConfig)
server.getConfig();
result.setBasicEncoding(serverConfig.getBasicEncoding());
@@ -113,14 +113,18 @@
// Netscape sends an extra \n\r after bodypart, swallow it
if (line != null && line.length() == 0) {
line = readLine();
+ if (line == null || line.length() == 0) {
+ return null;
+ }
}
// tokenize first line of HTTP request
StringTokenizer tokens = new StringTokenizer(line);
String method = tokens.nextToken();
- if (!"POST".equalsIgnoreCase(method)) {
+ if (!"POST".equalsIgnoreCase(method)) {
throw new BadRequestException(method);
- }
+ }
+ result.setMethod(method);
tokens.nextToken(); // Skip URI
String httpVersion = tokens.nextToken();
result.setHttpVersion(httpVersion);
@@ -149,8 +153,11 @@
public void run() {
try {
- for (;;) {
+ for (int i = 0; ; i++) {
RequestData data = getRequestConfig();
+ if (data == null) {
+ break;
+ }
server.execute(data, this);
output.flush();
if (!data.isKeepAlive() || !data.isSuccess())
{
No revision
No revision
1.1.2.4 +0 -1
ws-xmlrpc/src/java/org/apache/xmlrpc/server/Attic/XmlRpcStreamServer.java
Index: XmlRpcStreamServer.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/server/Attic/XmlRpcStreamServer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XmlRpcStreamServer.java 13 May 2005 21:06:37 -0000 1.1.2.3
+++ XmlRpcStreamServer.java 14 May 2005 21:17:49 -0000 1.1.2.4
@@ -111,7 +111,6 @@
}
message = pError.getMessage();
try {
- pError.printStackTrace();
getXmlRpcWriter(pConfig, pStream).write(pConfig, code,
message);
} catch (SAXException e) {
throw new XmlRpcException("Failed to write XML-RPC
response: " + e.getMessage(), e);
No revision
No revision
1.4.2.2 +8 -0 ws-xmlrpc/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/ws-xmlrpc/.classpath,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- .classpath 12 May 2005 01:58:53 -0000 1.4.2.1
+++ .classpath 14 May 2005 21:17:49 -0000 1.4.2.2
@@ -24,5 +24,13 @@
<attributes>
</attributes>
</classpathentry>
+ <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/commons-logging.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
