[jboss-svn-commits] JBL Code SVN: r14830 - in labs/jbossesb/trunk/product/samples/quickstarts/deadletter: src/org/jboss/soa/esb/samples/quickstart/deadletter and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-09-03 08:04:38 -0400 (Mon, 03 Sep 2007)
New Revision: 14830

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/deadletter/log4j.xml
   labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
   labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
Log:
Fix race and log4j: JBESB-965

Modified: labs/jbossesb/trunk/product/samples/quickstarts/deadletter/log4j.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/deadletter/log4j.xml	2007-09-03 11:54:04 UTC (rev 14829)
+++ labs/jbossesb/trunk/product/samples/quickstarts/deadletter/log4j.xml	2007-09-03 12:04:38 UTC (rev 14830)
@@ -61,6 +61,9 @@
    <category name="org.jboss.internal.soa.esb">
       <priority value="ERROR"/>
    </category>
+   <category name="org.jboss.soa.esb.samples.quickstart.deadletter">
+      <priority value="INFO"/>
+   </category>
    <category name="org.apache">
       <priority value="ERROR"/>
    </category>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java	2007-09-03 11:54:04 UTC (rev 14829)
+++ labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingAsyncAction.java	2007-09-03 12:04:38 UTC (rev 14830)
@@ -74,28 +74,25 @@
            
             //Adding this control code to show where the message now is.
             Map<URI, Message> rdlvrMessageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
-            rdlvrMessageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
             while (rdlvrMessageMap.size() == 0) { //we may have to wait for the DLQService to act.
-                rdlvrMessageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
-                for (URI key : rdlvrMessageMap.keySet()) {
-                    Message rdlvrMessage = rdlvrMessageMap.get(key);
-                    logger.info("*******************************");
-                    logger.info("Message in the RDLVR should be the same message: " + message.getBody().toString().equals(rdlvrMessage.getBody().toString()));
-                    logger.info("Message=" + message.getBody());
-                    logger.info("rdlvrMessage=" + rdlvrMessage.getBody());
-                    logger.info("*******************************");
-                    logger.info("Removing message to avoid future redeliveries");
-                    ms.removeMessage(key, MessageStore.CLASSIFICATION_RDLVR);
+                logger.info("...Waiting for the DLQ Service to act.");
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    logger.error(ie);
                 }
-                if (rdlvrMessageMap.size() == 0) {
-                    logger.info("...Waiting for the DLQ Service to act.");
-                    try {
-                        Thread.sleep(100);
-                    } catch (InterruptedException ie) {
-                        logger.error(ie);
-                    }
-                }
+                rdlvrMessageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
             }
+            for (URI key : rdlvrMessageMap.keySet()) {
+                Message rdlvrMessage = rdlvrMessageMap.get(key);
+                logger.info("*******************************");
+                logger.info("Message in the RDLVR should be the same message: " + message.getBody().toString().equals(rdlvrMessage.getBody().toString()));
+                logger.info("Message=" + message.getBody());
+                logger.info("rdlvrMessage=" + rdlvrMessage.getBody());
+                logger.info("*******************************");
+                logger.info("Removing message to avoid future redeliveries");
+                ms.removeMessage(key, MessageStore.CLASSIFICATION_RDLVR);
+            }
         } catch (MessageStoreException mse) {
             throw new ActionProcessingException(mse.getMessage(), mse);
         } catch (MessageDeliverException mde) {

Modified: labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java	2007-09-03 11:54:04 UTC (rev 14829)
+++ labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/MyFailingSyncAction.java	2007-09-03 12:04:38 UTC (rev 14830)
@@ -81,26 +81,24 @@
             try {
                 Map<URI, Message> messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
                 while (messageMap.size() == 0) { //we may have to wait for the DLQ Service to act.
-                    messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
-                    for (URI key : messageMap.keySet()) {
-                        Message dlqMessage = messageMap.get(key);
-                        logger.info("*******************************");
-                        logger.info("Message in the RDLVR queue should be the same message: " + message.getBody().toString().equals(dlqMessage.getBody().toString()));
-                        logger.info("Message=" + message.getBody());
-                        logger.info("dlqMessage=" + dlqMessage.getBody());
-                        logger.info("*******************************");
-                        logger.info("Removing message to avoid future redeliveries");
-                        ms.removeMessage(key, MessageStore.CLASSIFICATION_RDLVR);
+                    logger.info("...Waiting for the DLQ Service to act.");
+                    try {
+                        Thread.sleep(100);
+                    } catch (InterruptedException ie) {
+                        logger.error(ie);
                     }
-                    if (messageMap.size() == 0) {
-                        logger.info("...Waiting for the DLQ Service to act.");
-                        try {
-                            Thread.sleep(100);
-                        } catch (InterruptedException ie) {
-                            logger.error(ie);
-                        }
-                    }
+                    messageMap = ms.getAllMessages(MessageStore.CLASSIFICATION_RDLVR);
                 }
+                for (URI key : messageMap.keySet()) {
+                    Message dlqMessage = messageMap.get(key);
+                    logger.info("*******************************");
+                    logger.info("Message in the RDLVR queue should be the same message: " + message.getBody().toString().equals(dlqMessage.getBody().toString()));
+                    logger.info("Message=" + message.getBody());
+                    logger.info("dlqMessage=" + dlqMessage.getBody());
+                    logger.info("*******************************");
+                    logger.info("Removing message to avoid future redeliveries");
+                    ms.removeMessage(key, MessageStore.CLASSIFICATION_RDLVR);
+                }
             } catch (MessageStoreException mse) {
                 throw new ActionProcessingException(mse.getMessage(), mse);
             }