diff options
Diffstat (limited to 'qpid/java/client')
3 files changed, 21 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java index 399534e834..74a0956933 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java @@ -308,7 +308,7 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate { AMQSession s = (AMQSession) it.next(); // _protocolHandler.addSessionByChannel(s.getChannelId(), s); - reopenChannel(s.getChannelId(), s.getDefaultPrefetchHigh(), s.getDefaultPrefetchLow(), s.getTransacted()); + reopenChannel(s.getChannelId(), s.getDefaultPrefetchHigh(), s.getDefaultPrefetchLow(), s.isTransacted()); s.resubscribe(); } } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 4b6015945e..2ae7a17af2 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -256,7 +256,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic protected AMQConnection _connection; /** Used to indicate whether or not this is a transactional session. */ - protected boolean _transacted; + protected final boolean _transacted; /** Holds the sessions acknowledgement mode. */ protected final int _acknowledgeMode; @@ -1619,7 +1619,24 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic return _ticket; } - public boolean getTransacted() + /** + * Indicates whether the session is in transacted mode. + * + * @return true if the session is in transacted mode + * @throws IllegalStateException - if session is closed. + */ + public boolean getTransacted() throws JMSException + { + // Sun TCK checks that javax.jms.IllegalStateException is thrown for closed session + // nowhere else this behavior is documented + checkNotClosed(); + return _transacted; + } + + /** + * Indicates whether the session is in transacted mode. + */ + public boolean isTransacted() { return _transacted; } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java index ab3a0284a6..7daebbff04 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java @@ -152,7 +152,7 @@ public class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, BasicMe _logger.debug("Sending ack for delivery tag " + deliveryTag + " on channel " + _channelId); } - getProtocolHandler().writeFrame(ackFrame, !getTransacted()); + getProtocolHandler().writeFrame(ackFrame, !isTransacted()); _unacknowledgedMessageTags.remove(deliveryTag); } |