[jboss-cvs] JBoss Messaging SVN: r8621 - in branches/Branch_1_4: integration/AS5/src/main/org/jboss/jms/server/endpoint and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 12 14:18:56 EDT 2014
Author: aogburn
Date: 2014-03-12 14:18:55 -0400 (Wed, 12 Mar 2014)
New Revision: 8621
Modified:
branches/Branch_1_4/.classpath
branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java
branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
[JBMESSAGING-1941] remove old AspectManager synchronization to avoid deadlock
Modified: branches/Branch_1_4/.classpath
===================================================================
--- branches/Branch_1_4/.classpath 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/.classpath 2014-03-12 18:18:55 UTC (rev 8621)
@@ -1,65 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="docs/examples/queue-failover/src"/>
- <classpathentry kind="src" path="integration/EAP4/src/main"/>
- <classpathentry kind="src" path="integration/EAP4/tests-src"/>
<classpathentry kind="src" path="docs/examples/bridge/src"/>
- <classpathentry kind="src" path="docs/examples/stateless-clustered/src"/>
- <classpathentry kind="src" path="docs/examples/web-service/src-client"/>
- <classpathentry kind="src" path="docs/examples/web-service/src"/>
- <classpathentry kind="src" path="docs/examples/mdb-failure/src"/>
+ <classpathentry kind="src" path="integration/EAP5/src/main"/>
+ <classpathentry kind="src" path="integration/EAP5/tests-src"/>
+ <classpathentry kind="src" path="docs/examples/common/src"/>
<classpathentry kind="src" path="docs/examples/distributed-queue/src"/>
- <classpathentry kind="src" path="output/gen-parsers"/>
- <classpathentry kind="src" path="docs/examples/common/src"/>
<classpathentry kind="src" path="docs/examples/distributed-topic/src"/>
<classpathentry kind="src" path="docs/examples/ejb3mdb/src"/>
<classpathentry kind="src" path="docs/examples/http/src"/>
+ <classpathentry kind="src" path="docs/examples/mdb-failure/src"/>
<classpathentry kind="src" path="docs/examples/mdb/src"/>
- <classpathentry kind="src" path="docs/examples/ordering-group/src"/>
+ <classpathentry kind="src" path="docs/examples/queue-failover/src"/>
<classpathentry kind="src" path="docs/examples/queue/src"/>
<classpathentry kind="src" path="docs/examples/secure-socket/src"/>
+ <classpathentry kind="src" path="docs/examples/stateless-clustered/src"/>
<classpathentry kind="src" path="docs/examples/stateless/src"/>
<classpathentry kind="src" path="docs/examples/topic/src"/>
- <classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
- <classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src"/>
- <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar" sourcepath="/extra/work-clebert/concurrent/concurrent/src"/>
- <classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
+ <classpathentry kind="src" path="docs/examples/web-service/src"/>
+ <classpathentry kind="src" path="docs/examples/web-service/src-client"/>
+ <classpathentry kind="src" path="output/gen-parsers"/>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="tests/src"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/avalon-framework-cvs-20020806.jar"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/batik.jar"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/fop.jar"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/jai_codec.jar"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/jai_core.jar"/>
+ <classpathentry kind="lib" path="lib/docbook-support/support/lib/rowan-0.1.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
- <classpathentry kind="lib" path="thirdparty/hsqldb/lib/hsqldb.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
- <classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-modeler/lib/commons-modeler.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina-manager.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina-optional.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/catalina.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-compiler-jdt.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-compiler.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/jasper-runtime.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/naming-resources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-default.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-invoker.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/servlets-webdav.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-ajp.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-apr.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-coyote.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-http.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-tomcat/lib/tomcat-util.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="thirdparty/commons-el/lib/commons-el.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j/lib/dom4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/hsqldb/lib/hsqldb.jar"/>
<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossretro-rt/lib/jbossretro-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting-src.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/test14/lib/jboss-test14.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common-jdbc-wrapper.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-transaction-client.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jms-ra.jar"/>
+ <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/backport-util-concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-runtime.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-transformer.jar"/>
+ <classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
<classpathentry kind="lib" path="thirdparty/trove/lib/trove.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
+ <classpathentry kind="lib" path="tools/lib/jbossbuild.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar" sourcepath="thirdparty/jgroups/lib/jgroups-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/snmpTrapAppender.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/resolver.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xml-apis.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups-sources.jar"/>
+ <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-client.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossjts-integration.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossjts-jacorb.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossjts.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts/lib/jbossts-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-classloading-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-corba-ots-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-deployment-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-integration.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-jca-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-transaction-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbosssx-client/lib/jbosssx-client.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-guice-int.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-spring-int.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2se.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-system-jmx.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-transaction-client.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosssx-client.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jms-ra.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-common-jdbc-wrapper.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosscx-client.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-managed.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jboss-man/lib/jboss-managed.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jboss-man/lib/jboss-metatype.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-mbeans.jar"/>
+ <classpathentry kind="output" path="tests/output/classes"/>
</classpath>
Modified: branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -29,7 +29,6 @@
import javax.jms.JMSException;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
@@ -276,25 +275,13 @@
String connectionID = endpoint.getConnectionID();
- ConnectionAdvised connAdvised;
+ ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- connAdvised = new ConnectionAdvised(endpoint);
- }
-
Dispatcher.instance.registerTarget(connectionID, connAdvised);
log.trace("created and registered " + endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
- }
+ return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
}
public byte[] getClientAOPStack() throws JMSException
Modified: branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -30,7 +30,6 @@
import javax.jms.JMSException;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
@@ -279,25 +278,13 @@
String connectionID = endpoint.getConnectionID();
- ConnectionAdvised connAdvised;
+ ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- connAdvised = new ConnectionAdvised(endpoint);
- }
-
Dispatcher.instance.registerTarget(connectionID, connAdvised);
log.trace("created and registered " + endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
- }
+ return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
}
public byte[] getClientAOPStack() throws JMSException
Modified: branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -29,7 +29,6 @@
import javax.jms.JMSException;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
@@ -276,25 +275,13 @@
String connectionID = endpoint.getConnectionID();
- ConnectionAdvised connAdvised;
+ ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- connAdvised = new ConnectionAdvised(endpoint);
- }
-
Dispatcher.instance.registerTarget(connectionID, connAdvised);
log.trace("created and registered " + endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
- }
+ return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID());
}
public byte[] getClientAOPStack() throws JMSException
Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -61,43 +61,38 @@
*/
public void deployXML(byte[] config) throws Exception
{
+
+ InputStream is = null;
+
+ try
+ {
+ is = new ByteArrayInputStream(config);
- //We need to synchronized to prevent a deadlock
- //See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- InputStream is = null;
+ DocumentBuilderFactory docBuilderFactory = null;
+
+ docBuilderFactory = DocumentBuilderFactory.newInstance();
- try
- {
- is = new ByteArrayInputStream(config);
-
- DocumentBuilderFactory docBuilderFactory = null;
+ docBuilderFactory.setValidating(false);
- docBuilderFactory = DocumentBuilderFactory.newInstance();
+ InputSource source = new InputSource(is);
- docBuilderFactory.setValidating(false);
+ URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
- InputSource source = new InputSource(is);
+ source.setSystemId(url.toString());
- URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- source.setSystemId(url.toString());
+ docBuilder.setEntityResolver(new Resolver());
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ Document doc = docBuilder.parse(source);
- docBuilder.setEntityResolver(new Resolver());
-
- Document doc = docBuilder.parse(source);
-
- this.deployXML(doc, null, this.getClass().getClassLoader());
- }
- finally
+ this.deployXML(doc, null, this.getClass().getClassLoader());
+ }
+ finally
+ {
+ if (is != null)
{
- if (is != null)
- {
- is.close();
- }
+ is.close();
}
}
}
Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -35,7 +35,6 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
@@ -236,15 +235,8 @@
// Now bind it in JNDI
rebindConnectionFactory(initialContext, jndiBindings, delegate);
- ConnectionFactoryAdvised advised;
+ ConnectionFactoryAdvised advised = new ConnectionFactoryAdvised(endpoint);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- advised = new ConnectionFactoryAdvised(endpoint);
- }
-
// Registering with the dispatcher should always be the last thing otherwise a client could
// use a partially initialised object
Dispatcher.instance.registerTarget(id, advised);
Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
@@ -372,12 +371,7 @@
// TODO: What we really need to do is to wrap the End point in registerConnection, when we
// get the connection. But, I'm hesitant, because there are are many of instanceof checks that would
// fail if I wrapped it during registerConneciton.
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- sce = new ConnectionAdvised(sce);
- }
+ sce = new ConnectionAdvised(sce);
try
{
sce.closing(-1);
@@ -470,12 +464,7 @@
// wrap the Endpoint in the ConnectionAdvised so that we get a proper call back for the close
// TODO: What we really need to do is to wrap the Endpoint in registerConnection, when we
// get the connection. Then anyone
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- conn = new ConnectionAdvised(conn);
- }
+ conn = new ConnectionAdvised(conn);
try
{
conn.closing(-1);
Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -36,7 +36,6 @@
import javax.jms.JMSException;
import javax.jms.Session;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.remoting.CallbackManager;
import org.jboss.jms.delegate.ConnectionEndpoint;
@@ -265,15 +264,8 @@
sessions.put(sessionID, ep);
}
- SessionAdvised advised;
+ SessionAdvised advised = new SessionAdvised(ep);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- advised = new SessionAdvised(ep);
- }
-
SessionAdvised sessionAdvised = advised;
serverPeer.addSession(sessionID, ep);
Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621)
@@ -39,7 +39,6 @@
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
-import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientBrowserDelegate;
import org.jboss.jms.client.delegate.ClientConsumerDelegate;
import org.jboss.jms.delegate.Ack;
@@ -2031,15 +2030,8 @@
binding.queue.getName(), this, selectorString, false,
dest, null, null, 0, 1, true, false, prefetchSize);
- ConsumerAdvised advised;
+ ConsumerAdvised advised = new ConsumerAdvised(ep);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- advised = new ConsumerAdvised(ep);
- }
-
Dispatcher.instance.registerTarget(consumerID, advised);
ClientConsumerDelegate stub =
@@ -2351,15 +2343,8 @@
rep.put(queue.getName(), DUR_SUB_STATE_CONSUMERS);
}
- ConsumerAdvised advised;
+ ConsumerAdvised advised = new ConsumerAdvised(ep);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- advised = new ConsumerAdvised(ep);
- }
-
Dispatcher.instance.registerTarget(consumerID, advised);
ClientConsumerDelegate stub =
@@ -2415,15 +2400,8 @@
browsers.put(browserID, ep);
}
- BrowserAdvised advised;
+ BrowserAdvised advised = new BrowserAdvised(ep);
- // Need to synchronized to prevent a deadlock
- // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
- synchronized (AspectManager.instance())
- {
- advised = new BrowserAdvised(ep);
- }
-
Dispatcher.instance.registerTarget(browserID, advised);
ClientBrowserDelegate stub = new ClientBrowserDelegate(browserID);
More information about the jboss-cvs-commits
mailing list