svn commit: r1097072 - in /camel/trunk/components/camel-jms/src: main/java/org/apache/camel/component/jms/JmsPollingConsumer.java test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java

[davsclaus]

Author: davsclaus
Date: Wed Apr 27 10:33:17 2011
New Revision: 1097072

URL: http://svn.apache.org/viewvc?rev=1097072&view=rev
Log:
Fixed test.

Modified:
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java?rev=1097072&r1=1097071&r2=1097072&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
 Wed Apr 27 10:33:17 2011
@@ -20,6 +20,7 @@ import javax.jms.Message;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.PollingConsumerSupport;
+import org.apache.camel.util.ObjectHelper;
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.JmsTemplate;
 
@@ -51,9 +52,9 @@ public class JmsPollingConsumer extends 
 
     public Exchange receive(long timeout) {
         setReceiveTimeout(timeout);
-        Message message = null;
+        Message message;
         // using the selector
-        if (jmsEndpoint.getSelector() != null && 
jmsEndpoint.getSelector().length() > 0) {
+        if (ObjectHelper.isNotEmpty(jmsEndpoint.getSelector())) {
             message = template.receiveSelected(jmsEndpoint.getSelector());
         } else {
             message = template.receive();

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java?rev=1097072&r1=1097071&r2=1097072&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTimerBasedPollingConsumerTest.java
 Wed Apr 27 10:33:17 2011
@@ -18,7 +18,6 @@ package org.apache.camel.component.jms;
 
 import javax.jms.ConnectionFactory;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.ProducerTemplate;
@@ -67,7 +66,7 @@ public class JmsTimerBasedPollingConsume
 
                 from("activemq:queue.foo").to("mock:result");
 
-                from("timer://foo?period=5000").bean(cool, 
"someBusinessLogic");
+                from("timer://foo?period=1000").bean(cool, 
"someBusinessLogic");
                 // END SNIPPET: e1
             }
         };
@@ -76,7 +75,7 @@ public class JmsTimerBasedPollingConsume
     // START SNIPPET: e2
     public static class MyCoolBean {
 
-        private int count;
+        private volatile int count;
         private ConsumerTemplate consumer;
         private ProducerTemplate producer;
 
@@ -91,8 +90,8 @@ public class JmsTimerBasedPollingConsume
         public void someBusinessLogic() {
             // loop to empty queue
             while (true) {
-                // receive the message from the queue, wait at most 3 sec
-                String msg = consumer.receiveBody("activemq:queue.inbox", 
3000, String.class);
+                // receive the message from the queue
+                String msg = 
consumer.receiveBodyNoWait("activemq:queue.inbox", String.class);
                 if (msg == null) {
                     // no more messages in queue
                     break;