Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cosmetic cleanup 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@803257 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Jencks 2009-08-11 19:37:45 +00:00
parent c0ba767a88
commit bc72c54a65
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java
View File

@ -17,7 +17,6 @@
package org.apache.activemq.ra; package org.apache.activemq.ra;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import javax.jms.Connection; import javax.jms.Connection;
@ -68,7 +67,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
private Subject subject; private Subject subject;
private ActiveMQConnectionRequestInfo info; private ActiveMQConnectionRequestInfo info;
private boolean destoryed; private boolean destroyed;
public ActiveMQManagedConnection(Subject subject, ActiveMQConnection physicalConnection, ActiveMQConnectionRequestInfo info) throws ResourceException { public ActiveMQManagedConnection(Subject subject, ActiveMQConnection physicalConnection, ActiveMQConnectionRequestInfo info) throws ResourceException {
try { try {
@ -124,7 +123,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
// Do we need to change the associated userid/password // Do we need to change the associated userid/password
if (!matches(info.getUserName(), this.info.getUserName()) || !matches(info.getPassword(), this.info.getPassword())) { if (!matches(info.getUserName(), this.info.getUserName()) || !matches(info.getPassword(), this.info.getPassword())) {
((ActiveMQConnection)physicalConnection).changeUserInfo(info.getUserName(), info.getPassword()); physicalConnection.changeUserInfo(info.getUserName(), info.getPassword());
} }
// Do we need to set the clientId? // Do we need to set the clientId?
@ -188,7 +187,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
} }
private boolean isDestroyed() { private boolean isDestroyed() {
return destoryed; return destroyed;
} }
/** /**
@ -206,7 +205,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
try { try {
physicalConnection.close(); physicalConnection.close();
destoryed = true; destroyed = true;
} catch (JMSException e) { } catch (JMSException e) {
LOG.info("Error occured during close of a JMS connection.", e); LOG.info("Error occured during close of a JMS connection.", e);
} }
@ -231,7 +230,7 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
proxyConnections.clear(); proxyConnections.clear();
try { try {
((ActiveMQConnection)physicalConnection).cleanup(); physicalConnection.cleanup();
} catch (JMSException e) { } catch (JMSException e) {
throw new ResourceException("Could cleanup the ActiveMQ connection: " + e, e); throw new ResourceException("Could cleanup the ActiveMQ connection: " + e, e);
} }
@ -343,12 +342,11 @@ public class ActiveMQManagedConnection implements ManagedConnection, ExceptionLi
} }
/** /**
* @param subject * @param subject subject to match
* @param info * @param info cri to match
* @return * @return whether the subject and cri match sufficiently to allow using this connection under the new circumstances
*/ */
public boolean matches(Subject subject, ConnectionRequestInfo info) { public boolean matches(Subject subject, ConnectionRequestInfo info) {
// Check to see if it is our info class // Check to see if it is our info class
if (info == null) { if (info == null) {
return false; return false;