stop returning the passed resource object, return value isnt really used as all config must be done before calling the method
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2ec9c3f4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2ec9c3f4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2ec9c3f4 Branch: refs/heads/master Commit: 2ec9c3f41b15520adece0349b1d9e5250e6a35b6 Parents: ccc39ef Author: Robert Gemmell <[email protected]> Authored: Thu Feb 26 12:56:23 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Thu Feb 26 12:56:23 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/qpid/jms/JmsConnection.java | 9 ++++----- .../main/java/org/apache/qpid/jms/JmsMessageConsumer.java | 2 +- .../main/java/org/apache/qpid/jms/JmsMessageProducer.java | 2 +- .../src/main/java/org/apache/qpid/jms/JmsSession.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ec9c3f4/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java index 32470ee..0905d11 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java @@ -521,7 +521,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti connectionInfo.setClientId(clientIdGenerator.generateId()); } - this.connectionInfo = createResource(connectionInfo); + createResource(connectionInfo); this.connected.set(true); } } @@ -532,7 +532,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti protected TemporaryQueue createTemporaryQueue() throws JMSException { String destinationName = connectionInfo.getConnectionId() + ":" + tempDestIdGenerator.incrementAndGet(); JmsTemporaryQueue queue = new JmsTemporaryQueue(destinationName); - queue = createResource(queue); + createResource(queue); tempDestinations.put(queue, queue); queue.setConnection(this); return queue; @@ -544,7 +544,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti protected TemporaryTopic createTemporaryTopic() throws JMSException { String destinationName = connectionInfo.getConnectionId() + ":" + tempDestIdGenerator.incrementAndGet(); JmsTemporaryTopic topic = new JmsTemporaryTopic(destinationName); - topic = createResource(topic); + createResource(topic); tempDestinations.put(topic, topic); topic.setConnection(this); return topic; @@ -606,14 +606,13 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti //----- Provider interface methods ---------------------------------------// - <T extends JmsResource> T createResource(T resource) throws JMSException { + void createResource(JmsResource resource) throws JMSException { checkClosedOrFailed(); try { ProviderFuture request = new ProviderFuture(); provider.create(resource, request); request.sync(); - return resource; } catch (Exception ex) { throw JmsExceptionSupport.create(ex); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ec9c3f4/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java index c843930..ac70db0 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java @@ -114,7 +114,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC this.consumerInfo.setPrefetchSize(getConfiguredPrefetch(destination, policy)); try { - this.consumerInfo = session.getConnection().createResource(consumerInfo); + session.getConnection().createResource(consumerInfo); } catch (JMSException ex) { throw ex; } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ec9c3f4/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java index 7d296c2..c76358d 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java @@ -55,7 +55,7 @@ public class JmsMessageProducer implements MessageProducer { this.flexibleDestination = destination == null; this.producerInfo = new JmsProducerInfo(producerId); this.producerInfo.setDestination(destination); - this.producerInfo = session.getConnection().createResource(producerInfo); + session.getConnection().createResource(producerInfo); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2ec9c3f4/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java index 9da95af..3182ddd 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java @@ -113,7 +113,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa this.sessionInfo.setAcknowledgementMode(acknowledgementMode); this.sessionInfo.setSendAcksAsync(connection.isSendAcksAsync()); - this.sessionInfo = connection.createResource(sessionInfo); + connection.createResource(sessionInfo); } int acknowledgementMode() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
