antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

minor cleanups

Browse source
This commit is contained in:
hns 2001-01-24 14:28:54 +00:00
parent bea0eb3320
commit d7efbb9e32
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/helma/xmlrpc/WebServer.java
View file

@ -47,7 +47,7 @@ public class WebServer implements Runnable {
} }
// XmlRpc.setDebug (true); // XmlRpc.setDebug (true);
XmlRpc.setKeepAlive (true); XmlRpc.setKeepAlive (true);
// XmlRpc.setEncoding ("UTF-8"); XmlRpc.setEncoding ("UTF-8");
try { try {
WebServer webserver = new WebServer (p); WebServer webserver = new WebServer (p);
// webserver.setParanoid (true); // webserver.setParanoid (true);
@ -172,8 +172,9 @@ public class WebServer implements Runnable {
public void run() { public void run() {
try { try {
while (listener != null) { while (listener != null) {
Socket socket = null;
try { try {
Socket socket = serverSocket.accept(); socket = serverSocket.accept();
if (!paranoid || checkSocket (socket)) { if (!paranoid || checkSocket (socket)) {
Runner runner = getRunner (); Runner runner = getRunner ();
runner.handle (socket); runner.handle (socket);
@ -182,8 +183,10 @@ public class WebServer implements Runnable {
socket.close (); socket.close ();
} catch (Exception ex) { } catch (Exception ex) {
System.err.println("Exception in XML-RPC listener loop (" + ex + ")."); System.err.println("Exception in XML-RPC listener loop (" + ex + ").");
try { socket.close (); } catch (Exception ignore) {}
} catch (Error err) { } catch (Error err) {
System.err.println("Error in XML-RPC listener loop (" + err + ")."); System.err.println("Error in XML-RPC listener loop (" + err + ").");
try { socket.close (); } catch (Exception ignore) {}
} }
} }
} catch (Exception exception) { } catch (Exception exception) {
@ -274,7 +277,6 @@ class Connection implements Runnable {
private Socket socket; private Socket socket;
private BufferedInputStream input; private BufferedInputStream input;
private BufferedOutputStream output; private BufferedOutputStream output;
// private Thread responder;
private long lastRequest; private long lastRequest;
private String user, password; private String user, password;
@ -285,8 +287,6 @@ class Connection implements Runnable {
this.socket = socket; this.socket = socket;
input = new BufferedInputStream (socket.getInputStream()); input = new BufferedInputStream (socket.getInputStream());
output = new BufferedOutputStream (socket.getOutputStream()); output = new BufferedOutputStream (socket.getOutputStream());
// responder = new Thread (this, "xmlrpc-worker");
// responder.start();
} }
@ -312,7 +312,7 @@ class Connection implements Runnable {
String method = tokens.nextToken(); String method = tokens.nextToken();
String uri = tokens.nextToken (); String uri = tokens.nextToken ();
String httpversion = tokens.nextToken (); String httpversion = tokens.nextToken ();
keepalive = XmlRpc.getKeepAlive() && "HTTP/1.1".equals (httpversion); keepalive = XmlRpc.getKeepAlive() && "HTTP/1.1".equalsIgnoreCase (httpversion);
do { do {
line = readLine(); line = readLine();
if (line != null) { if (line != null) {