[jboss-cvs] JBoss Messaging SVN: r8638 - in branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954: src/main/org/jboss/messaging/core/impl/postoffice and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 8 05:55:02 EDT 2015
Author: raggz
Date: 2015-09-08 05:55:02 -0400 (Tue, 08 Sep 2015)
New Revision: 8638
Modified:
branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/
branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/.classpath
branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/build-messaging.xml
branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Backport JBMESSAGING-1954.
Property changes on: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/Branch_1_4:8481
/branches/JBM1842:8169-8232
+ /branches/Branch_1_4:8481,8631
/branches/JBM1842:8169-8232
Modified: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/.classpath
===================================================================
--- branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/.classpath 2015-09-08 07:13:44 UTC (rev 8637)
+++ branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/.classpath 2015-09-08 09:55:02 UTC (rev 8638)
@@ -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/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/build-messaging.xml
===================================================================
--- branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/build-messaging.xml 2015-09-08 07:13:44 UTC (rev 8637)
+++ branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/build-messaging.xml 2015-09-08 09:55:02 UTC (rev 8638)
@@ -53,9 +53,9 @@
<property name="messaging.version.minor" value="4"/>
<property name="messaging.version.revision" value="8"/>
<property name="messaging.version.incrementing" value="51"/>
- <property name="messaging.version.tag" value="SP5"/>
+ <property name="messaging.version.tag" value="SP5_JBPAPP-11227"/>
<property name="messaging.version.name" value="Kevardrek"/>
- <property name="messaging.version.cvstag" value="JBossMessaging_1_4_8_SP5"/>
+ <property name="messaging.version.cvstag" value="JBossMessaging_1_4_8_SP5_JBPAPP-11227"/>
<property name="module.name" value="messaging"/>
<property name="module.Name" value="JBoss Messaging"/>
<property name="module.version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>
Modified: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2015-09-08 07:13:44 UTC (rev 8637)
+++ branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2015-09-08 09:55:02 UTC (rev 8638)
@@ -3028,14 +3028,14 @@
}
}
- //check inactive condition
- if (inactiveConditions.contains(condition))
- {
- throw new IllegalStateException("Destination " + condition + " not active!");
- }
-
try
{
+ //check inactive condition
+ if (inactiveConditions.contains(condition))
+ {
+ throw new IllegalStateException("Destination " + condition + " not active!");
+ }
+
List queues = (List)mappings.get(condition);
if (queues != null)
More information about the jboss-cvs-commits
mailing list