Author: jochen
Date: Sun Nov 6 18:50:47 2005
New Revision: 331184
URL: http://svn.apache.org/viewcvs?rev=331184&view=rev
Log:
Cleared warnings.
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java?rev=331184&r1=331183&r2=331184&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/client/XmlRpcLiteHttpTransport.java
Sun Nov 6 18:50:47 2005
@@ -155,7 +155,7 @@
conn.socket.shutdownOutput();
}
};
- sendRequestHeaders((XmlRpcHttpClientConfig)
pConfig, conn, conn.output);
+ sendRequestHeaders(conn, conn.output);
return conn.output;
} catch (ConnectException e) {
if (tries >= retries) {
@@ -180,8 +180,7 @@
pOut.write(toHTTPBytes(pKey + ": " + pValue + "\r\n"));
}
- private void sendRequestHeaders(XmlRpcHttpClientConfig pConfig,
-
Connection pConnection,
+ private void sendRequestHeaders(Connection pConnection,
OutputStream pOut) throws IOException {
pOut.write(("POST " + pConnection.uri + "
HTTP/1.0\r\n").getBytes("US-ASCII"));
for (Iterator iter = pConnection.headers.entrySet().iterator();
iter.hasNext(); ) {
@@ -207,7 +206,7 @@
Connection conn = (Connection) pConnection;
conn.socket = new Socket(conn.hostname, conn.port);
conn.output = new
BufferedOutputStream(conn.socket.getOutputStream());
- sendRequestHeaders((XmlRpcHttpClientConfig) pConfig,
conn, conn.output);
+ sendRequestHeaders(conn, conn.output);
conn.output.write(pContent);
conn.output.flush();
} catch (IOException e) {
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java?rev=331184&r1=331183&r2=331184&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletConnection.java
Sun Nov 6 18:50:47 2005
@@ -22,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.xmlrpc.server.XmlRpcStreamServer;
import org.apache.xmlrpc.util.ThreadPool.Task;
@@ -31,26 +30,18 @@
* servlet connection.
*/
public class ServletConnection implements Task {
- private final WebServer webServer;
private final HttpServlet servlet;
- private final XmlRpcStreamServer xmlRpcServer;
private final Socket socket;
private final HttpServletRequest request;
private final HttpServletResponse response;
/** Creates a new instance.
- * @param pWebServer The webserver, which is creating this connection.
* @param pServlet The servlet, which ought to handle the request.
- * @param pXmlRpcServer The XmlRpcServer being used.
* @param pSocket The socket, to which the client is connected.
* @throws IOException
*/
- public ServletConnection(WebServer pWebServer, HttpServlet pServlet,
- XmlRpcStreamServer
pXmlRpcServer,
- Socket pSocket) throws
IOException {
- webServer = pWebServer;
+ public ServletConnection(HttpServlet pServlet, Socket pSocket) throws
IOException {
servlet = pServlet;
- xmlRpcServer = pXmlRpcServer;
socket = pSocket;
request = new HttpServletRequestImpl(socket);
response = new HttpServletResponseImpl(socket);
Modified:
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
URL:
http://svn.apache.org/viewcvs/webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java?rev=331184&r1=331183&r2=331184&view=diff
==============================================================================
---
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
(original)
+++
webservices/xmlrpc/branches/b20050512_streaming/src/java/org/apache/xmlrpc/webserver/ServletWebServer.java
Sun Nov 6 18:50:47 2005
@@ -117,6 +117,6 @@
protected ThreadPool.Task newTask(WebServer pWebServer,
XmlRpcStreamServer pXmlRpcServer,
Socket pSocket) throws IOException {
- return new ServletConnection(pWebServer, servlet,
pXmlRpcServer, pSocket);
+ return new ServletConnection(servlet, pSocket);
}
}
