Update of /cvsroot/monetdb/clients/src/java/src/nl/cwi/monetdb/xrpc/wrapper
In directory sc8-pr-cvs16:/tmp/cvs-serv24854/src/nl/cwi/monetdb/xrpc/wrapper
Modified Files:
XrpcWrapperWorker.java
Log Message:
Thread.getId() is a 1.5 method, so compilation fails on 1.4 Java
compilers. However, it's use was not entirely right, as thread IDs are
reused. Additionally, Java has a nice feature of giving a Thread a
name, so why not use that instead?
Index: XrpcWrapperWorker.java
===================================================================
RCS file:
/cvsroot/monetdb/clients/src/java/src/nl/cwi/monetdb/xrpc/wrapper/XrpcWrapperWorker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XrpcWrapperWorker.java 20 May 2007 14:10:13 -0000 1.1
+++ XrpcWrapperWorker.java 21 May 2007 11:18:27 -0000 1.2
@@ -22,7 +22,7 @@
import java.net.*;
import nl.cwi.monetdb.util.*;
-public class XrpcWrapperWorker extends Thread{
+public class XrpcWrapperWorker extends Thread {
public static final String XRPCD_CALLBACK = "/xrpc";
public static final String SOAP_NS =
"http://www.w3.org/2003/05/soap-envelope";;
@@ -62,6 +62,9 @@
"HTTP/1.1 500 Internal Server Error\r\n" +
"Content-type: text/xml; charset=\"utf-8\"\r\n\r\n";
+ /** Simple counter for XRPC worker threads. */
+ private static int tid = 0;
+
class SenderException extends Exception {
public SenderException(String reason) {
super(reason);
@@ -76,7 +79,6 @@
private Socket sock;
private CmdLineOpts opts;
- private long tid;
private String rootdir;
private int contentLength;
private boolean debug;
@@ -84,9 +86,9 @@
XrpcWrapperWorker(Socket s, CmdLineOpts o)
throws Exception
{
+ super("XrpcWrapperWorkerThread-" + tid++);
sock = s;
opts = o;
- tid = this.getId();
rootdir = o.getOption("rootdir").getArgument();
debug = o.getOption("debug").isPresent();
}
@@ -102,7 +104,7 @@
InputStream errorStream,
String errMsg)
{
- String errHeader = "ERROR: (TID "+tid+") sendError(): ";
+ String errHeader = "ERROR: (TID "+getName()+") sendError(): ";
try{
DEBUG(errHeader + "SOAP Fault message to send:\n" +
@@ -155,8 +157,8 @@
private void handleHttpReqHeader(BufferedReader sockIn)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") handleHttpReqHeader(): ";
- String errHeader = "ERROR: (TID "+tid+") handleHttpReqHeader(): ";
+ String infoHeader = "INFO: (TID "+getName()+") handleHttpReqHeader():
";
+ String errHeader = "ERROR: (TID "+getName()+") handleHttpReqHeader():
";
boolean foundPostHeader = false, foundClHeader = false;
@@ -206,8 +208,8 @@
String filename)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") getXrpcRequest(): ";
- String errHeader = "ERROR: (TID "+tid+") getXrpcRequest(): ";
+ String infoHeader = "INFO: (TID "+getName()+") getXrpcRequest(): ";
+ String errHeader = "ERROR: (TID "+getName()+") getXrpcRequest(): ";
StringBuffer buf = new
StringBuffer(XrpcWrapper.DEFAULT_BUFSIZE);
@@ -262,8 +264,8 @@
String attribute)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") getAttributeValue(): ";
- String errHeader = "ERROR: (TID "+tid+") getAttributeValue(): ";
+ String infoHeader = "INFO: (TID "+getName()+") getAttributeValue(): ";
+ String errHeader = "ERROR: (TID "+getName()+") getAttributeValue(): ";
int start, end;
@@ -300,8 +302,8 @@
private String getXrpcPrefix(StringBuffer request)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") getXrpcPrefix(): ";
- String errHeader = "ERROR: (TID "+tid+") getXrpcPrefix(): ";
+ String infoHeader = "INFO: (TID "+getName()+") getXrpcPrefix(): ";
+ String errHeader = "ERROR: (TID "+getName()+") getXrpcPrefix(): ";
int nsLen = XRPC_NS.length();
int start = request.indexOf("Envelope");
@@ -355,8 +357,8 @@
StringBuffer requestHeader)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") generateQuery(): ";
- String errHeader = "ERROR: (TID "+tid+") generateQuery(): ";
+ String infoHeader = "INFO: (TID "+getName()+") generateQuery(): ";
+ String errHeader = "ERROR: (TID "+getName()+") generateQuery(): ";
String xrpcPrefix = getXrpcPrefix(requestHeader);
String xqModule = getAttributeValue(requestHeader,
xrpcPrefix+":module");
@@ -413,8 +415,8 @@
BufferedWriter sockOut)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") execAndSend(): ";
- String errHeader = "ERROR: (TID "+tid+") execAndSend(): ";
+ String infoHeader = "INFO: (TID "+getName()+") execAndSend(): ";
+ String errHeader = "ERROR: (TID "+getName()+") execAndSend(): ";
int ret = -1, len = -1;
char[] cbuf = new char[XrpcWrapper.MIN_BUFSIZE];
String command = null;
@@ -480,11 +482,11 @@
private void handleXrpcReq(BufferedReader sockIn, BufferedWriter sockOut)
throws Exception
{
- String infoHeader = "INFO: (TID "+tid+") handleXrpcReq(): ";
- String warnHeader = "WARNING: (TID "+tid+") handleXrpcReq(): ";
+ String infoHeader = "INFO: (TID "+getName()+") handleXrpcReq(): ";
+ String warnHeader = "WARNING: (TID "+getName()+") handleXrpcReq(): ";
- String requestFilename = rootdir+"xrpc_request_"+tid+".xml";
- String queryFilename = rootdir+"xrpc_wrapper_query_"+tid+".xq";
+ String requestFilename = rootdir+"xrpc_request_"+getName()+".xml";
+ String queryFilename = rootdir+"xrpc_wrapper_query_"+getName()+".xq";
StringBuffer requestHeader = storeXrpcRequest(sockIn, requestFilename);
generateQuery(requestFilename, queryFilename, requestHeader);
@@ -515,8 +517,8 @@
public void run()
{
- String warnHeader = "WARNING: (TID "+tid+") run(): ";
- String errHeader = "ERROR: (TID "+tid+") run(): ";
+ String warnHeader = "WARNING: (TID "+getName()+") run(): ";
+ String errHeader = "ERROR: (TID "+getName()+") run(): ";
BufferedReader sockIn = null;
BufferedWriter sockOut = null;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
