Author: clebert.suconic(a)jboss.com Date: 2011-02-17 00:37:12 -0500 (Thu, 17 Feb 2011) New Revision: 10228 Modified: branches/Branch_2_2_EAP/build-maven.xml branches/Branch_2_2_EAP/hornetq-rest/pom.xml branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties branches/Branch_2_2_EAP/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: new version Modified: branches/Branch_2_2_EAP/build-maven.xml =================================================================== --- branches/Branch_2_2_EAP/build-maven.xml 2011-02-17 05:35:53 UTC (rev 10227) +++ branches/Branch_2_2_EAP/build-maven.xml 2011-02-17 05:37:12 UTC (rev 10228) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.0.EAP-QA-10222"/> + <property name="hornetq.version" value="2.2.0.EAP-QA-10227"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> Modified: branches/Branch_2_2_EAP/hornetq-rest/pom.xml =================================================================== --- branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-02-17 05:35:53 UTC (rev 10227) +++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-02-17 05:37:12 UTC (rev 10228) @@ -10,7 +10,7 @@ <properties> <resteasy.version>2.0.1.GA</resteasy.version> - <hornetq.version>2.2.0.EAP-QA-10222</hornetq.version> + <hornetq.version>2.2.0.EAP-QA-10227</hornetq.version> </properties> <licenses> Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties =================================================================== --- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-17 05:35:53 UTC (rev 10227) +++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-17 05:37:12 UTC (rev 10228) @@ -1,4 +1,4 @@ -hornetq.version.versionName=QA_10222 +hornetq.version.versionName=QA_10227 hornetq.version.majorVersion=2 hornetq.version.minorVersion=2 hornetq.version.microVersion=0 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2011-02-17 05:35:53 UTC (rev 10227) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2011-02-17 05:37:12 UTC (rev 10228) @@ -297,7 +297,7 @@ threadPool.shutdown(); - boolean ok = threadPool.awaitTermination(10000, TimeUnit.MILLISECONDS); + boolean ok = threadPool.awaitTermination(10, TimeUnit.SECONDS); if (!ok) { Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-02-17 05:35:53 UTC (rev 10227) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-02-17 05:37:12 UTC (rev 10228) @@ -949,7 +949,7 @@ } - //assertFalse("Thread Failed", failedThread); + assertFalse("Thread Failed", failedThread); super.tearDown(); }