You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/09/18 04:31:24 UTC
svn commit: r816440 - in
/webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local:
InquiryService.java PublishService.java RequestHandler.java
Author: tcunning
Date: Fri Sep 18 02:31:24 2009
New Revision: 816440
URL: http://svn.apache.org/viewvc?rev=816440&view=rev
Log:
JUDDI-284
Do not create a new thread for each request.
Modified:
webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/InquiryService.java
webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/PublishService.java
webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/RequestHandler.java
Modified: webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/InquiryService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/InquiryService.java?rev=816440&r1=816439&r2=816440&view=diff
==============================================================================
--- webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/InquiryService.java (original)
+++ webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/InquiryService.java Fri Sep 18 02:31:24 2009
@@ -80,17 +80,13 @@
//new RequestHandler on it's own thread
RequestHandler requestHandler = new RequestHandler();
- requestHandler.setUddiReq(uddiReq);
String operation = requestHandler.getOperation(uddiReq);
String version = requestHandler.getVersion(uddiReq,operation);
validateRequest(operation, version, uddiReq);
- Thread thread = new Thread(requestHandler, "WorkThread");
- thread.start();
- thread.join();
if (requestHandler.getException()!=null) {
throw new Exception(requestHandler.getException());
}
- return requestHandler.getResponse();
+ return requestHandler.invoke(uddiReq);
}
}
Modified: webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/PublishService.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/PublishService.java?rev=816440&r1=816439&r2=816440&view=diff
==============================================================================
--- webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/PublishService.java (original)
+++ webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/PublishService.java Fri Sep 18 02:31:24 2009
@@ -84,16 +84,9 @@
{
//new RequestHandler on it's own thread
RequestHandler requestHandler = new RequestHandler();
- requestHandler.setUddiReq(uddiReq);
String operation = requestHandler.getOperation(uddiReq);
String version = requestHandler.getVersion(uddiReq, operation);
validateRequest(operation, version, uddiReq);
- Thread thread = new Thread(requestHandler, "WorkThread");
- thread.start();
- thread.join();
- if (requestHandler.getException()!=null) {
- throw new Exception(requestHandler.getException());
- }
- return requestHandler.getResponse();
+ return requestHandler.invoke(uddiReq);
}
}
Modified: webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/RequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/RequestHandler.java?rev=816440&r1=816439&r2=816440&view=diff
==============================================================================
--- webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/RequestHandler.java (original)
+++ webservices/juddi/branches/juddi-2.0.0/src/main/java/org/apache/juddi/registry/local/RequestHandler.java Fri Sep 18 02:31:24 2009
@@ -41,7 +41,7 @@
/**
* @author Kurt Stam (kurt.stam@redhat.com)
*/
-public class RequestHandler implements Runnable
+public class RequestHandler
{
// private reference to the webapp's logger.
private static Log log = LogFactory.getLog(RequestHandler.class);
@@ -51,7 +51,6 @@
private volatile String version;
private volatile String operation;
- private volatile Element uddiReq;
private volatile Node response;
private volatile String exception;
@@ -101,7 +100,7 @@
return version;
}
- public void run()
+ public Node invoke (Element uddiReq) throws Exception
{
try
{
@@ -206,7 +205,7 @@
+ ", faultActor=" + faultActor + ", errno=" + errno + ", errCode=" + errCode
+ ", errText=" + errText;
setException(fault);
-
+ throw new Exception(fault);
}
catch(Exception ex) // Catch any other exceptions
{
@@ -240,8 +239,9 @@
String fault = "faultCode=" + faultCode + ", faultString=" + faultString
+ ", faultActor=" + faultActor + ", errno=" + errno + ", errCode=" + errCode
+ ", errText=" + errText;
- setException(fault);
+ throw new Exception(fault);
}
+ return response;
}
/**
@@ -287,12 +287,6 @@
public void setResponse(Node response) {
this.response = response;
}
-public Element getUddiReq() {
- return uddiReq;
-}
-public void setUddiReq(Element uddiReq) {
- this.uddiReq = uddiReq;
-}
public String getVersion() {
return version;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org