[jboss-svn-commits] JBL Code SVN: r27095 - in labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss: soa/esb/listeners/deployers/mc and 1 other directory.

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

Author: beve
Date: 2009-06-23 08:20:03 -0400 (Tue, 23 Jun 2009)
New Revision: 27095

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
Log:
Reverting the change I made to JmsCourier.
Disabled the LifecycleShutdown Hook which was done for the AS 4 deployer but that I totally missed :(


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2009-06-23 10:39:59 UTC (rev 27094)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2009-06-23 12:20:03 UTC (rev 27095)
@@ -421,33 +421,6 @@
         }
 
         javax.jms.Message jmsMessage = null;
-        try
-        {
-            jmsMessage = receiveOne(millis);
-            _logger.debug("Received : " + jmsMessage);
-        }
-        catch (final JMSException e)
-        {
-            if (!jmsConnectRetry(e))
-            {
-                throw new CourierTransportException("Caught exception during receive and could not reconnect! ",e);
-            }
-            // Try again...
-            try
-            {
-                jmsMessage = receiveOne(millis);
-            }
-            catch (final JMSException e2)
-            {
-                throw new CourierTransportException("Caught exception during delivery having successfully recovered! ",e2);
-            }
-        }
-        catch (Exception e) 
-        {
-            throw new CourierTransportException("Exception caught : ", e);
-        }
-        
-        /*
         synchronized(this) {
             if (null != _messageConsumer) {
                 try {
@@ -469,18 +442,9 @@
                 }
             }
         }
-        */
         return jmsMessage;
     } // ________________________________
     
-    private javax.jms.Message receiveOne(final long timeout) throws JMSException
-    {
-        if (_messageConsumer == null)
-            return null;
-        
-        return _messageConsumer.receive(timeout);
-    }
-
     /**
      * Sets the strategy for handling the setting of properties on an outgoing
      * JMS Message.

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java	2009-06-23 10:39:59 UTC (rev 27094)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java	2009-06-23 12:20:03 UTC (rev 27095)
@@ -101,6 +101,7 @@
     public void create()
     {
         LifecycleResourceManager.getSingleton().associateDeployment(deploymentName) ;
+        LifecycleResourceManager.deactivateHook() ;
     }
 
     public void start() throws Exception