[jboss-cvs] JBoss Messaging SVN: r8090 - in branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805: src/main/org/jboss/messaging/core/impl/clusterconnection and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 8 12:43:55 EDT 2010
Author: jbertram at redhat.com
Date: 2010-10-08 12:43:55 -0400 (Fri, 08 Oct 2010)
New Revision: 8090
Modified:
branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/.classpath
branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
Log:
JBPAPP-5224
Modified: branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/.classpath
===================================================================
--- branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/.classpath 2010-10-08 15:59:42 UTC (rev 8089)
+++ branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/.classpath 2010-10-08 16:43:55 UTC (rev 8090)
@@ -1,67 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="docs/examples/queue-failover/src"/>
- <classpathentry kind="src" path="integration/EAP4/src"/>
- <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/AS5/tests-src"/>
+ <classpathentry kind="src" path="integration/AS5/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="output/lib/jboss-messaging.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/jrockit-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/jbossts14/lib/jbossjta-integration.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossts-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.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-common.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.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-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-xml-binding.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosscx-client.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jbosssx-client.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jms-ra.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jnp-client.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" sourcepath="thirdparty/jboss/remoting/lib/jboss-remoting-src.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
+ <classpathentry kind="lib" path="thirdparty/wutka-dtdparser/lib/dtdparser.jar"/>
+ <classpathentry kind="lib" path="tools/lib/jbossbuild.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="output/lib/jboss-messaging-client.jar"/>
+ <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/jboss/jboss-mdr/lib/jboss-mdr-sources.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-standalone-aspect-library-jdk50.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-asintegration-core.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-asintegration-jmx.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc.jar"/>
+ <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/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="var" path="ANT_HOME"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="tests/output/classes"/>
</classpath>
Modified: branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java 2010-10-08 15:59:42 UTC (rev 8089)
+++ branches/Branch_JBossMessaging_1_4_6_GA_JBMESSAGING-1805/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java 2010-10-08 16:43:55 UTC (rev 8090)
@@ -212,23 +212,6 @@
suspended = true;
- try
- {
- consumer.closing(-1);
- }
- catch (Throwable t)
- {
- // Ignore
- }
- try
- {
- consumer.close();
- }
- catch (Throwable t)
- {
- // Ignore
- }
-
sourceSession = null;
consumer = null;
More information about the jboss-cvs-commits
mailing list