You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rm...@apache.org on 2016/12/03 15:26:44 UTC
svn commit: r1772472 - in /geronimo/specs/trunk/geronimo-jms_2.0_spec:
pom.xml src/main/java/javax/jms/QueueRequestor.java
src/main/java/javax/jms/TopicRequestor.java
Author: rmannibucau
Date: Sat Dec 3 15:26:44 2016
New Revision: 1772472
URL: http://svn.apache.org/viewvc?rev=1772472&view=rev
Log:
GERONIMO-6559 check topic is passed in constructor
Modified:
geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/QueueRequestor.java
geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/TopicRequestor.java
Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml?rev=1772472&r1=1772471&r2=1772472&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/pom.xml Sat Dec 3 15:26:44 2016
@@ -39,11 +39,11 @@
<version>1.0-SNAPSHOT</version>
<description>Java Message Service 2.0 API</description>
- <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+ <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
<distributionManagement>
<site>
<id>apache-website</id>
- <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+ <url>${site.deploy.url}/maven/${siteId}/${project.version}</url>
</site>
</distributionManagement>
Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/QueueRequestor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/QueueRequestor.java?rev=1772472&r1=1772471&r2=1772472&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/QueueRequestor.java (original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/QueueRequestor.java Sat Dec 3 15:26:44 2016
@@ -37,9 +37,7 @@ public class QueueRequestor {
public QueueRequestor(QueueSession session, Queue queue)
throws JMSException
{
- super();
-
- if(queue == null) {
+ if(!Queue.class.isInstance(queue)) {
throw new InvalidDestinationException("Invalid queue");
}
Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/TopicRequestor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/TopicRequestor.java?rev=1772472&r1=1772471&r2=1772472&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/TopicRequestor.java (original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/TopicRequestor.java Sat Dec 3 15:26:44 2016
@@ -35,9 +35,10 @@ public class TopicRequestor {
private TopicPublisher publisher;
private TopicSubscriber subscriber;
- public TopicRequestor(TopicSession session, Topic topic)
- throws JMSException {
- super();
+ public TopicRequestor(TopicSession session, Topic topic) throws JMSException {
+ if(!Topic.class.isInstance(topic)) {
+ throw new InvalidDestinationException("Invalid topic");
+ }
setSession(session);
setTopic(topic);
setTemporaryTopic(session.createTemporaryTopic());