You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/12/19 14:21:45 UTC
svn commit: r1775103 - in /axis/axis2/java/core/branches/1_7: ./
modules/transport/jms/
modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/
modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/
Author: veithen
Date: Mon Dec 19 14:21:44 2016
New Revision: 1775103
URL: http://svn.apache.org/viewvc?rev=1775103&view=rev
Log:
AXIS2-5825: Merge r1775081 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java
- copied unchanged from r1775081, axis/axis2/java/core/trunk/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml
axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 14:21:44 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081
Modified: axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml?rev=1775103&r1=1775102&r2=1775103&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/jms/pom.xml Mon Dec 19 14:21:44 2016
@@ -167,6 +167,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
Modified: axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1775103&r1=1775102&r2=1775103&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java Mon Dec 19 14:21:44 2016
@@ -431,9 +431,17 @@ public class JMSUtils extends BaseUtils
throws JMSException {
if (dest instanceof Queue) {
- return ((QueueSession) session).createReceiver((Queue) dest, messageSelector);
+ if (session instanceof QueueSession) {
+ return ((QueueSession) session).createReceiver((Queue) dest, messageSelector);
+ } else {
+ return session.createConsumer(dest, messageSelector);
+ }
} else {
- return ((TopicSession) session).createSubscriber((Topic) dest, messageSelector, false);
+ if (session instanceof TopicSession) {
+ return ((TopicSession) session).createSubscriber((Topic) dest, messageSelector, false);
+ } else {
+ return session.createConsumer(dest, messageSelector);
+ }
}
}