[jboss-cvs] JBossAS SVN: r77356 - trunk/testsuite/src/main/org/jboss/test/timer/ejb.

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

Author: jesper.pedersen
Date: 2008-08-22 07:43:07 -0400 (Fri, 22 Aug 2008)
New Revision: 77356

Modified:
   trunk/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java
Log:
[JBAS-5866] Always close session and sender

Modified: trunk/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java	2008-08-22 11:31:21 UTC (rev 77355)
+++ trunk/testsuite/src/main/org/jboss/test/timer/ejb/OnCreateTimerMessageBean.java	2008-08-22 11:43:07 UTC (rev 77356)
@@ -101,7 +101,7 @@
       try
       {
          ctx = new InitialContext();
-         QueueConnectionFactory qcf = (QueueConnectionFactory) ctx.lookup("java:comp/env/jms/QCF");
+         QueueConnectionFactory qcf = (QueueConnectionFactory) ctx.lookup("ConnectionFactory");
          qc = qcf.createQueueConnection();
          ts = messageContext.getTimerService();
       }
@@ -188,10 +188,11 @@
       throws JMSException
    {
       QueueSession qs = null;
+      QueueSender sender = null;
       try
       {
          qs = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-         QueueSender sender = qs.createSender(dest);
+         sender = qs.createSender(dest);
          TextMessage reply = qs.createTextMessage();
          reply.setText(msg + " : " + msgID);
          reply.setIntProperty("UNIQUE_ID", msgID);
@@ -201,14 +202,29 @@
       }
       finally
       {
-         try
+         if (sender != null)
          {
-            qs.close();
-            log.info("JBossMQ QueueSession Closed");
+            try
+            {
+               sender.close();
+               log.info("JBossMQ QueueSender Closed");
+            }
+            catch (JMSException e)
+            {
+               log.error("Failed to close queue sender", e);
+            }
          }
-         catch (JMSException e)
+         if (qs != null)
          {
-            log.error("Failed to close queue session", e);
+            try
+            {
+               qs.close();
+               log.info("JBossMQ QueueSession Closed");
+            }
+            catch (JMSException e)
+            {
+               log.error("Failed to close queue session", e);
+            }
          }
       }
    }