diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2012-03-08 21:46:22 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2012-03-08 21:46:22 +0000 |
| commit | a567ec9a74897ca77b75b93caa2ed3d6e3fb7223 (patch) | |
| tree | 399cda215f4b3e80b1fb757674e538434cca0fee /java/jca | |
| parent | 15cad8cd7c59817d5d5650eb416322c3384e01d8 (diff) | |
| download | qpid-python-a567ec9a74897ca77b75b93caa2ed3d6e3fb7223.tar.gz | |
QPID-3806 Committing a patch by Weston Price.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1298600 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/jca')
4 files changed, 8 insertions, 6 deletions
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java index 081677ca4b..a72f51da51 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java @@ -30,4 +30,6 @@ public interface QpidRASession public void start() throws JMSException; public void close() throws JMSException; + + public void closeSession() throws JMSException; } diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java index cf28d5bba1..2747282a3c 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java @@ -58,5 +58,5 @@ public interface QpidRASessionFactory extends Connection, TopicConnection, Queue * @param session The session * @throws JMSException for any error */ - void closeSession(QpidRASessionImpl session) throws JMSException; + void closeSession(QpidRASession session) throws JMSException; } diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java index e2bc2d2008..6d7a8d26bd 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java @@ -567,7 +567,7 @@ public class QpidRASessionFactoryImpl implements QpidRASessionFactory, Reference _started = true; for (Iterator<QpidRASession> i = _sessions.iterator(); i.hasNext();) { - QpidRASessionImpl session = (QpidRASessionImpl)i.next(); + QpidRASession session = (QpidRASession)i.next(); session.start(); } } @@ -609,7 +609,7 @@ public class QpidRASessionFactoryImpl implements QpidRASessionFactory, Reference { for (Iterator<QpidRASession> i = _sessions.iterator(); i.hasNext();) { - QpidRASessionImpl session = (QpidRASessionImpl)i.next(); + QpidRASession session = (QpidRASession)i.next(); try { session.closeSession(); @@ -670,7 +670,7 @@ public class QpidRASessionFactoryImpl implements QpidRASessionFactory, Reference * @param session The session * @exception JMSException Thrown if an error occurs */ - public void closeSession(final QpidRASessionImpl session) throws JMSException + public void closeSession(final QpidRASession session) throws JMSException { if (_log.isTraceEnabled()) { @@ -679,7 +679,7 @@ public class QpidRASessionFactoryImpl implements QpidRASessionFactory, Reference synchronized (_sessions) { - _sessions.remove(session); + _sessions.clear(); } } diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java index fdd4888a3d..c4cfeaba48 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java @@ -1446,7 +1446,7 @@ public class QpidRASessionImpl implements Session, QueueSession, TopicSession, X * Close session * @exception JMSException Thrown if an error occurs */ - void closeSession() throws JMSException + public void closeSession() throws JMSException { final QpidRAManagedConnection mc = this._mc; if (mc != null) |