You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2017/10/27 21:34:42 UTC

[1/2] tomee git commit: removing double wrapping -> ActiveMQMessage was cast to DelegateMessage

Repository: tomee
Updated Branches:
  refs/heads/master 1618c1c30 -> 73d788ac3


removing double wrapping -> ActiveMQMessage was cast to DelegateMessage


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8558e49c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8558e49c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8558e49c

Branch: refs/heads/master
Commit: 8558e49c1ce95bfc03ebc0dc6f203e6b43361168
Parents: 1618c1c
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 15:19:46 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 15:19:46 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/8558e49c/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java
index c1ad431..1f7e78a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/jms2/JMS2.java
@@ -110,6 +110,6 @@ public final class JMS2 {
         if (StreamMessage.class.isInstance(message10)) {
             return (T) new WrappingStreamMessage(StreamMessage.class.cast(message10));
         }
-        return (T) new DelegateMessage(DelegateMessage.class.cast(message10));
+        return (T) new DelegateMessage(message10);
     }
 }


[2/2] tomee git commit: unit test

Posted by tv...@apache.org.
unit test


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/73d788ac
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/73d788ac
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/73d788ac

Branch: refs/heads/master
Commit: 73d788ac3fcf661c756a136feacf0a75024d65a0
Parents: 8558e49
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Fri Oct 27 16:09:09 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Fri Oct 27 16:09:09 2017 -0400

----------------------------------------------------------------------
 .../org/apache/openejb/activemq/JMS2AMQTest.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/73d788ac/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQTest.java b/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQTest.java
index aa8f8d2..ba6ab54 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQTest.java
@@ -268,6 +268,18 @@ public class JMS2AMQTest {
     }
 
     @Test
+    public void sendMessageToMdb() throws Exception {
+        try (final JMSContext context = cf.createContext()) {
+            Message message = context.createMessage();
+            message.setStringProperty("text", TEXT);
+            context.createProducer().send(destination, message);
+            assertTrue(Listener.sync());
+        } catch (final JMSRuntimeException ex) {
+            fail(ex.getMessage());
+        }
+    }
+
+    @Test
     public void sendToMdbWithDefaultCf() throws Exception {
         defaultContext.createProducer().send(destination, TEXT);
         assertTrue(Listener.sync());
@@ -378,9 +390,10 @@ public class JMS2AMQTest {
         public void onMessage(final Message message) {
             try {
                 try {
-                    ok = TextMessage.class.isInstance(message)
+                    ok = (TextMessage.class.isInstance(message)
                             && TEXT.equals(TextMessage.class.cast(message).getText())
-                            && TEXT.equals(message.getBody(String.class));
+                            && TEXT.equals(message.getBody(String.class)))
+                            || message.getStringProperty("text").equals(TEXT);
                 } catch (final JMSException e) {
                     // no-op
                 }