[jbpm-commits] JBoss JBPM SVN: r6689 - jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/jms.

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2010-09-28 08:02:37 -0400 (Tue, 28 Sep 2010)
New Revision: 6689

Modified:
   jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/jms/JmsConnectorService.java
Log:
Cleaned up the connector by putting the close in the finally block.

Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/jms/JmsConnectorService.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/jms/JmsConnectorService.java	2010-09-28 11:52:37 UTC (rev 6688)
+++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/jms/JmsConnectorService.java	2010-09-28 12:02:37 UTC (rev 6689)
@@ -70,30 +70,36 @@
   }
 
   void sendWithoutSaving(Job job) {
+	  MessageProducer messageProducer = null;
+	  Session session = null;
     try {
-      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      MessageProducer messageProducer = session.createProducer(factory.getDestination());
+      session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+      messageProducer = session.createProducer(factory.getDestination());
       Message message = session.createMessage();
       populateMessage(message, job);
       messageProducer.send(message);
-      
-      try {
-          messageProducer.close();
-        }
-        catch (JMSException e) {
-          log.warn("could not close message producer", e);
-        }
-
-        try {
-          session.close();
-        }
-        catch (JMSException e) {
-          log.warn("could not close jms session", e);
-        }
     }
     catch (JMSException e) {
       throw new JbpmException("could not send jms message", e);
     }
+    finally {
+      if(messageProducer!=null) {
+    		try {
+    			messageProducer.close();
+  			}
+    		catch (JMSException e) {
+    	    	  log.warn("could not close message producer", e);
+    	    }
+	  }
+      if(session!=null) {
+	      try {
+	            session.close();
+	      }
+	      catch (JMSException e) {
+	    	  log.warn("could not close jms session", e);
+	      }
+      }
+    }
   }
 
   protected void populateMessage(Message message, Job job) throws JMSException {