Author: jochen
Date: Wed Dec 21 01:27:36 2005
New Revision: 358238
URL: http://svn.apache.org/viewcvs?rev=358238&view=rev
Log:
Fixed differences between trunk and XMLRPC_2_0_BRANCH.
Added:
webservices/xmlrpc/trunk/src/site/
Removed:
webservices/xmlrpc/trunk/xdocs/
Modified:
webservices/xmlrpc/trunk/.cvsignore
webservices/xmlrpc/trunk/changes.xml
webservices/xmlrpc/trunk/project.properties
webservices/xmlrpc/trunk/project.xml
webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/DefaultXmlRpcTransportFactory.java
webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/WebServer.java
Modified: webservices/xmlrpc/trunk/.cvsignore
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/.cvsignore?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/.cvsignore (original)
+++ webservices/xmlrpc/trunk/.cvsignore Wed Dec 21 01:27:36 2005
@@ -10,3 +10,4 @@
xmlrpc-*.zip
bin
docs
+xmlrpc-*.jar
Modified: webservices/xmlrpc/trunk/changes.xml
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/changes.xml?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/changes.xml (original)
+++ webservices/xmlrpc/trunk/changes.xml Wed Dec 21 01:27:36 2005
@@ -5,7 +5,7 @@
<body>
<release version="2.1" date="in CVS">
<action dev="jochen" type="fix" issue="XMLRPC-68"
- due-to="Johan Oskarson" due-to-email="[EMAIL PROTECTED]">
+ due-to="Johan Oskarson" due-to-email="johan at oskarsson.nu">
The Webserver class was unable to handle basic authentication,
because the BASE64 codec wasn't initialized.
</action>
Modified: webservices/xmlrpc/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/project.properties?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/project.properties (original)
+++ webservices/xmlrpc/trunk/project.properties Wed Dec 21 01:27:36 2005
@@ -26,6 +26,7 @@
# XDOC PLUGIN
# -------------------------------------------------------------------
+maven.docs.src = src/site/xdoc
maven.xdoc.date = left
maven.xdoc.version = ${pom.currentVersion}
Modified: webservices/xmlrpc/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/project.xml?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/project.xml (original)
+++ webservices/xmlrpc/trunk/project.xml Wed Dec 21 01:27:36 2005
@@ -2,7 +2,6 @@
<project>
<pomVersion>3</pomVersion>
<name>xmlrpc</name>
- <comment>Apache XML-RPC is a Java implementation of , a popular protocol
that uses XML over HTTP to implement remote procedure calls. Apache XML-RPC was
previously known as Helma XML-RPC. If you have code using the Helma library,
all you should have to do is change the import statements in your code from
helma.xmlrpc.* to org.apache.xmlrpc.*.</comment>
<id>xmlrpc</id>
<currentVersion>2.1-dev</currentVersion>
<organization>
Modified:
webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/DefaultXmlRpcTransportFactory.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/DefaultXmlRpcTransportFactory.java?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
---
webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/DefaultXmlRpcTransportFactory.java
(original)
+++
webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/DefaultXmlRpcTransportFactory.java
Wed Dec 21 01:27:36 2005
@@ -40,7 +40,7 @@
protected URL url;
protected String auth;
- protected static XmlRpcTransportFactory httpsTransportFactory;
+ protected XmlRpcTransportFactory httpsTransportFactory;
public static final String DEFAULT_HTTPS_PROVIDER = "comnetsun";
@@ -54,7 +54,7 @@
transports.put("comnetsun",
"org.apache.xmlrpc.secure.sunssl.SunSSLTransportFactory");
}
- public static void setHTTPSTransport(String transport, Properties
properties)
+ public void setHTTPSTransport(String transport, Properties properties)
throws XmlRpcClientException
{
httpsTransportFactory = createTransportFactory(transport, properties);
@@ -156,7 +156,7 @@
return httpsTransportFactory.createTransport();
}
- return new DefaultXmlRpcTransport(url);
+ return new DefaultXmlRpcTransport(url, auth);
}
/**
Modified: webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/WebServer.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/WebServer.java?rev=358238&r1=358237&r2=358238&view=diff
==============================================================================
--- webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/WebServer.java
(original)
+++ webservices/xmlrpc/trunk/src/java/org/apache/xmlrpc/WebServer.java Wed Dec
21 01:27:36 2005
@@ -445,9 +445,12 @@
{
while (listener != null)
{
+ Socket socket = null;
+ Runner runner = null;
+
try
{
- Socket socket = serverSocket.accept();
+ socket = serverSocket.accept();
try
{
socket.setTcpNoDelay(true);
@@ -459,7 +462,7 @@
if (allowConnection(socket))
{
- Runner runner = getRunner();
+ runner = getRunner();
runner.handle(socket);
}
else
@@ -487,6 +490,19 @@
+ err + ").");
err.printStackTrace();
}
+ finally
+ {
+ if (runner == null && socket != null)
+ {
+ try
+ {
+ socket.close();
+ }
+ catch (Throwable e)
+ {
+ }
+ }
+ }
}
}
catch (Exception exception)
