[jboss-svn-commits] JBL Code SVN: r10110 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/routing and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 9 21:07:59 EST 2007
Author: kurt.stam at jboss.com
Date: 2007-03-09 21:07:59 -0500 (Fri, 09 Mar 2007)
New Revision: 10110
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/RegistryUtilUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/utils/DrainQueuesAndTopics.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
labs/jbossesb/trunk/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
labs/jbossesb/trunk/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
Log:
Closing JNDI context. This releases the resources immediately.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -512,6 +512,7 @@
try {
Context context = Configuration.getNamingContext(CONFIGURATION_SECTION);
topic = (Topic) context.lookup(notificationTopic);
+ context.close();
} catch (ConfigurationException e) {
logger.error("Topic lookup failed for the Transformation configuration Update Listener. Topic name '" + notificationTopic + "'. \n\t\tThis JMS Topic may not be deployed, or this ESB instance may not be looking at the correct JMS provider (check configuration '" + Context.PROVIDER_URL + "' in config module/section '" + CONFIGURATION_SECTION + "'). \n\t\tUpdate listener not enabled!", e);
close();
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -215,20 +215,28 @@
// TODO: Modify to support topic destinations too
private JMSSendQueueSetup(String queueName) throws NamingException, JMSException {
- Context m_oCtx = NamingContext.getServerContext(
+ Context oCtx = NamingContext.getServerContext(
Configuration.getJndiServerURL(),
Configuration.getJndiServerContextFactory(),
Configuration.getJndiServerPkgPrefix());
- QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx.lookup("ConnectionFactory");
+ QueueConnectionFactory qcf = (QueueConnectionFactory) oCtx.lookup("ConnectionFactory");
QueueConnection oQconn = qcf.createQueueConnection();
this.queueName = queueName;
jmsSession = oQconn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
try {
- jmsQueue = (Queue) m_oCtx.lookup(queueName);
+ jmsQueue = (Queue) oCtx.lookup(queueName);
} catch (NamingException ne) {
jmsQueue = jmsSession.createQueue(queueName);
- }
+ } finally {
+ if (oCtx!=null) {
+ try {
+ oCtx.close();
+ } catch (NamingException ne) {
+ logger.error(ne.getMessage(), ne);
+ }
+ }
+ }
jmsProducer = jmsSession.createSender(jmsQueue);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -262,6 +262,7 @@
{
RegistryUtil.unregister(_serviceCategory, _serviceName, _myEpr) ;
}
+
}
/**
@@ -392,6 +393,14 @@
_messageReceiver = _queueSession.createReceiver(_queue,
_messageSelector);
+ if (null != oJndiCtx) try
+ {
+ oJndiCtx.close();
+ }
+ catch (NamingException ne)
+ {
+ _logger.error(ne.getMessage(), ne);
+ }
} // ________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/JmsRouterUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -24,10 +24,8 @@
import junit.framework.TestCase;
-import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.actions.ActionProcessingException;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/RegistryUtilUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/RegistryUtilUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/RegistryUtilUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -101,7 +101,8 @@
{
}
- ListenerInitializationException exp = new ListenerInitializationException();
+ @SuppressWarnings("unused")
+ ListenerInitializationException exp = new ListenerInitializationException();
exp = new ListenerInitializationException("bad things");
exp = new ListenerInitializationException("more bad things", new RuntimeException());
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListenerUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -162,7 +162,8 @@
testFile = File.createTempFile("foo", "testFile");
anTestFile = File.createTempFile("bar", "testFile");
- File[] files = gateway.getFileList("testFile");
+ @SuppressWarnings("unused")
+ File[] files = gateway.getFileList("testFile");
// TODO check why getFileList ignores the parameter! Hence this test fails!
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/gateway/RemoteGatewayListenerIntegrationTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -24,13 +24,9 @@
import java.io.File;
-import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
-import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
import org.jboss.soa.esb.common.tests.BaseTest;
import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.ListenerUtil;
-import org.jboss.soa.esb.listeners.gateway.GatewayException;
public class RemoteGatewayListenerIntegrationTest extends BaseTest
{
@@ -82,7 +78,8 @@
try
{
- byte[] contents = gateway.getFileContents(new File("bar"));
+ @SuppressWarnings("unused")
+ byte[] contents = gateway.getFileContents(new File("bar"));
fail();
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -120,7 +120,7 @@
return null;
}
- private void initialiseJMS (ConfigTree p_oP) throws ConfigurationException, JMSException
+ private void initialiseJMS (ConfigTree p_oP) throws ConfigurationException, JMSException, NamingException
{
// Only check for JMS attributes if a queue JNDI name was specified
String sJndiName = p_oP.getAttribute(COMMAND_JNDI_NAME);
@@ -206,6 +206,7 @@
m_oJmsSess = oSess;
m_oCmdSrc = oSess.createReceiver(oQ, sMsgSelector);
}
+ oJndiCtx.close();
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -26,12 +26,15 @@
import javax.naming.Context;
import javax.naming.NamingException;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.helpers.NamingContext;
public class Configuration
{
+ private static Logger _logger = Logger.getLogger(Configuration.class);
+
private static KeyValuePair[] s_oaKV = new KeyValuePair[]
{
new KeyValuePair(Environment.SMTP_HOST, getSmtpHost()),
@@ -369,7 +372,15 @@
throw new ConfigurationException("JNDI lookup of JMS Connection Factory [" + connectionFactoryRuntime + "] failed.", e);
} catch (ClassCastException e) {
throw new ConfigurationException("JNDI lookup of JMS Connection Factory failed. Class [" + connectionFactoryRuntime + "] is not an instance of [" + ConnectionFactory.class.getName() + "].", e);
- }
+ } finally {
+ if (context!=null) {
+ try {
+ context.close();
+ } catch (NamingException ne) {
+ _logger.error(ne.getMessage(), ne);
+ }
+ }
+ }
return factory;
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -35,6 +35,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.ConfigTree;
@@ -53,6 +54,7 @@
*/
public abstract class NotifyJMS extends NotificationTarget
{
+ private Logger log = Logger.getLogger(this.getClass());
/**
* Abstract method - All classes that extend NotifyJMS must implement it
* according to their own javax.jms.Destination needs (Queue/Topic)
@@ -163,6 +165,7 @@
}
catch (Exception e1)
{
+ log.error(e1.getMessage(), e1);
}
if (null != m_oConn) try
{
@@ -170,7 +173,16 @@
}
catch (Exception e2)
{
+ log.error(e2.getMessage(), e2);
}
+ if (null != m_oCtx) try
+ {
+ m_oCtx.close();
+ }
+ catch (NamingException ne)
+ {
+ log.error(ne.getMessage(), ne);
+ }
} // __________________________________
/**
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -101,17 +101,6 @@
throw new ConfigurationException(ex);
}
}
- /**
- * Closes the connections
- */
- private void cleanup() {
- try {
- m_oSess.close();
- m_oConn.close();
- } catch (JMSException jmse) {
- log.error("Could not close JMS resource. ", jmse);
- }
- }
/**
* Get the {@link QueueConnectionFactory} to be used for this instance. <p/>
@@ -146,7 +135,7 @@
log.error("Could not send message " + p_oMsg, e);
}
}
- cleanup();
+ release();
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -32,7 +32,6 @@
import javax.jms.TopicSession;
import javax.naming.NamingException;
-import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.ConfigTree;
/**
@@ -42,8 +41,6 @@
*/
public class NotifyTopics extends NotifyJMS
{
- private Logger log = Logger.getLogger(this.getClass());
-
public static final String CONNECTION_FACTORY = "ConnectionFactory";
public static final String CHILD_TOPIC = "topic";
@@ -97,14 +94,6 @@
} // __________________________________
- private void cleanup() {
- try {
- m_oSess.close();
- m_oConn.close();
- } catch (JMSException jmse) {
- log.error("Could not close JMS resource. ", jmse);
- }
- }
protected void sendToAll (Message p_oMsg)
{
for (int i1 = 0; i1 < m_oaMssProd.length; i1++)
@@ -119,7 +108,7 @@
{
}
}
- cleanup();
+ release();
} // __________________________________
} // ____________________________________________________________________________
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/utils/DrainQueuesAndTopics.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/utils/DrainQueuesAndTopics.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/utils/DrainQueuesAndTopics.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -41,8 +41,6 @@
{
private static final int MAX_TIMES_NOMSG = 10;
- private Context m_oCtx;
-
public DrainQueuesAndTopics() throws Exception
{
purgeQueueTopic("queue/A");
@@ -53,11 +51,6 @@
public int purgeQueueTopic(String p_sName) throws Exception
{
int iRet = 0;
- m_oCtx = NamingContext.getServerContext(
- NamingContext.JBOSS_PROVIDER_URL,
- NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY,
- NamingContext.JBOSS_URL_PKG_PREFIX);
-
System.out.println(p_sName);
MessageConsumer oCns = null;
switch(p_sName.toLowerCase().charAt(0))
@@ -89,17 +82,22 @@
QueueReceiver getQueue(String p_sJndi) throws Exception
{
+ Context oCtx = NamingContext.getServerContext(
+ NamingContext.JBOSS_PROVIDER_URL,
+ NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY,
+ NamingContext.JBOSS_URL_PKG_PREFIX);
+
QueueConnection oQconn = null;
QueueSession oQsess = null;
- QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx
+ QueueConnectionFactory qcf = (QueueConnectionFactory) oCtx
.lookup("ConnectionFactory");
oQconn = qcf.createQueueConnection();
oQsess = oQconn.createQueueSession(false
,QueueSession.AUTO_ACKNOWLEDGE);
Queue oQueue
- = (Queue) m_oCtx.lookup(p_sJndi);
-
+ = (Queue) oCtx.lookup(p_sJndi);
+ oCtx.close();
QueueReceiver oRcv = oQsess.createReceiver(oQueue);
oQconn.start();
return oRcv;
@@ -107,16 +105,21 @@
TopicSubscriber getTopic(String p_sJndi) throws Exception
{
+ Context oCtx = NamingContext.getServerContext(
+ NamingContext.JBOSS_PROVIDER_URL,
+ NamingContext.JBOSS_INITIAL_CONTEXT_FACTORY,
+ NamingContext.JBOSS_URL_PKG_PREFIX);
+
TopicConnection oTconn = null;
TopicSession oTsess = null;
- TopicConnectionFactory qcf = (TopicConnectionFactory) m_oCtx
+ TopicConnectionFactory qcf = (TopicConnectionFactory) oCtx
.lookup("ConnectionFactory");
oTconn = qcf.createTopicConnection();
oTsess = oTconn.createTopicSession(false
,QueueSession.AUTO_ACKNOWLEDGE);
- Topic oT = (Topic) m_oCtx.lookup(p_sJndi);
-
+ Topic oT = (Topic) oCtx.lookup(p_sJndi);
+ oCtx.close();
TopicSubscriber oRcv = oTsess.createSubscriber(oT);
oTconn.start();
return oRcv;
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/AppServerContextUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -44,5 +44,6 @@
assertEquals("org.jnp.interfaces.NamingContextFactory", props.get(Context.INITIAL_CONTEXT_FACTORY));
assertEquals("http://localhost:1234", props.get(Context.PROVIDER_URL));
assertEquals(null, props.get("java.naming.factory.url.pkgs"));
+ ctx.close();
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyQueuesUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -51,7 +51,7 @@
MockContextFactory.setAsInitial();
Context ctx = new InitialContext();
ctx.rebind(NotifyQueues.CONNECTION_FACTORY, new QueueConnectionFactoryImpl());
-
+ ctx.close();
ConfigTree rootEl = new ConfigTree("rootEl");
addMessagePropertyConfigs(rootEl);
@@ -122,7 +122,7 @@
Context ctx = new InitialContext();
ctx.rebind(queueName, mockQueue);
-
+ ctx.close();
return mockQueue;
}
@@ -132,7 +132,7 @@
Context ctx = new InitialContext();
ctx.rebind(topicName, mockTopic);
-
+ ctx.close();
return mockTopic;
}
}
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/notification/NotifyTopicsUnitTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -50,7 +50,7 @@
MockContextFactory.setAsInitial();
Context ctx = new InitialContext();
ctx.rebind(NotifyTopics.CONNECTION_FACTORY, new TopicConnectionFactoryImpl());
-
+ ctx.close();
ConfigTree rootEl = new ConfigTree("rootEl");
addMessagePropertyConfigs(rootEl);
@@ -120,7 +120,7 @@
Context ctx = new InitialContext();
ctx.rebind(topicName, mockTopic);
-
+ ctx.close();
return mockTopic;
}
}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -4,6 +4,7 @@
import java.sql.SQLException;
import javax.naming.Context;
+import javax.naming.NamingException;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
@@ -79,6 +80,18 @@
_logger.error(ex);
throw new ConfigurationException(ex);
}
+ finally
+ {
+ if (null != oJndiCtx) try
+ {
+ oJndiCtx.close();
+ }
+ catch (NamingException ne)
+ {
+ _logger.error(ne.getMessage(), ne);
+ }
+
+ }
}
Modified: labs/jbossesb/trunk/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/samples/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -107,6 +107,7 @@
QueueReceiver qr = qs.createReceiver(inQueue);
qr.setMessageListener(this);
inQueueConnection.start();
+ ctx.close();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
Modified: labs/jbossesb/trunk/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/product/samples/trailblazer/banks/test/src/org/jboss/soa/esb/samples/loanbroker/banks/JmsProcessorTest.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -75,6 +75,7 @@
TextMessage msg = sess.createTextMessage(str);
QueueSender sender = sess.createSender(queue);
sender.send(msg);
+ ctx.close();
//if the test gets here without errors it passes.
assertTrue(true);
} catch (Exception e) {
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2007-03-09 23:34:21 UTC (rev 10109)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2007-03-10 02:07:59 UTC (rev 10110)
@@ -122,18 +122,19 @@
String queueName;
private JMSSendQueueSetup(QUEUE queue) throws Exception {
- Context m_oCtx = NamingContext.getServerContext(
+ Context oCtx = NamingContext.getServerContext(
Configuration.getJndiServerURL(),
Configuration.getJndiServerContextFactory(),
Configuration.getJndiServerPkgPrefix());
- QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx.lookup("ConnectionFactory");
+ QueueConnectionFactory qcf = (QueueConnectionFactory) oCtx.lookup("ConnectionFactory");
QueueConnection oQconn = qcf.createQueueConnection();
queueName = "queue/" + queue.name();
jmsSession = oQconn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- jmsQueue = (Queue) m_oCtx.lookup(queueName);
- jmsProducer = jmsSession.createSender(jmsQueue);
+ jmsQueue = (Queue) oCtx.lookup(queueName);
+ jmsProducer = jmsSession.createSender(jmsQueue);
+ oCtx.close();
}
private void close() {
More information about the jboss-svn-commits
mailing list