[jboss-svn-commits] JBL Code SVN: r33276 - in labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools: task/service and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lucazamador
Date: 2010-05-31 21:14:39 -0400 (Mon, 31 May 2010)
New Revision: 33276

Modified:
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClient.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientConnector.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java
   labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java
Log:
JBRULES-2521: Provide HornetQ implementation to process task
 - tests fixed

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/CommandBasedWSHumanTaskHandler.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -185,7 +185,7 @@
 		client.addTask(task, content, null);
 	}
 	
-	public void dispose() {
+	public void dispose() throws Exception {
 		if (client != null) {
 			client.disconnect();
 		}

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/process/workitem/wsht/WSHumanTaskHandler.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -174,7 +174,7 @@
 		client.addTask(task, content, null);
 	}
 	
-	public void dispose() {
+	public void dispose() throws Exception {
 		if (client != null) {
 			client.disconnect();
 		}

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClient.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClient.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClient.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -555,7 +555,7 @@
     	return connector.connect(address, port);
     }
     
-    public void disconnect() {
+    public void disconnect() throws Exception {
     	connector.disconnect();
     }
 

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientConnector.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientConnector.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/TaskClientConnector.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -6,7 +6,7 @@
 	
 	public boolean connect();
 	public boolean connect(String address, int port);
-	public void disconnect();
+	public void disconnect() throws Exception;
 	
 	public void write(Object message);
 	public BaseHandler getHandler();

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/BaseHornetQTaskServer.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -140,12 +140,21 @@
 	public void stop() throws Exception {
 		if (running) {
 			running = false;
-			consumer.close();
-			session.stop();
+			closeAll();
 		}
 		if (embeddedServerRunning) {
 			embeddedServerRunning = false;
+			closeAll();
 			server.stop();
 		}
 	}
+	
+	private void closeAll() throws HornetQException {
+		if (!session.isClosed()) {
+			session.close();
+		}
+		if (!consumer.isClosed()) {
+			consumer.close();
+		}
+	}
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java	2010-06-01 01:10:18 UTC (rev 33275)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/hornetq/HornetQTaskClientConnector.java	2010-06-01 01:14:39 UTC (rev 33276)
@@ -132,14 +132,12 @@
 		}
 	}
 
-	public void disconnect() {
+	public void disconnect() throws Exception {
 		if (session!= null && !session.isClosed()) {
-			try {
-				producer.close();
+			session.close();
+			producer.close();
+			if (consumer!=null) {
 				consumer.close();
-				session.close();
-			} catch (HornetQException e) {
-				e.printStackTrace();
 			}
 		}
 	}