Author: clebert.suconic(a)jboss.com Date: 2011-02-15 23:28:00 -0500 (Tue, 15 Feb 2011) New Revision: 10213 Modified: branches/Branch_2_2_EAP/.classpath branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java Log: fixing tests / tweaks Modified: branches/Branch_2_2_EAP/.classpath =================================================================== --- branches/Branch_2_2_EAP/.classpath 2011-02-16 00:15:54 UTC (rev 10212) +++ branches/Branch_2_2_EAP/.classpath 2011-02-16 04:28:00 UTC (rev 10213) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/> + <classpathentry kind="src" path="order-test-putnam"/> <classpathentry kind="src" path="src/config/common"/> <classpathentry kind="src" path="build/src"/> <classpathentry kind="src" path="tests/jms-tests/config"/> Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2011-02-16 00:15:54 UTC (rev 10212) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/LinkedListImpl.java 2011-02-16 04:28:00 UTC (rev 10213) @@ -182,7 +182,7 @@ toRemove.next = toRemove.prev = null; } - private void nudgeIterators(Node<E> node) + private synchronized void nudgeIterators(Node<E> node) { for (int i = 0; i < numIters; i++) { @@ -194,7 +194,7 @@ } } - private void addIter(Iterator iter) + private synchronized void addIter(Iterator iter) { if (numIters == iters.length) { @@ -206,7 +206,7 @@ numIters++; } - private void resize(int newSize) + private synchronized void resize(int newSize) { Iterator[] newIters = createIteratorArray(newSize); @@ -215,7 +215,7 @@ iters = newIters; } - private void removeIter(Iterator iter) + private synchronized void removeIter(Iterator iter) { for (int i = 0; i < numIters; i++) { Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2011-02-16 00:15:54 UTC (rev 10212) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2011-02-16 04:28:00 UTC (rev 10213) @@ -406,7 +406,7 @@ clientSession2.close(); } - + public void testReceiveRollback() throws Exception { int numSessions = 100; @@ -1020,7 +1020,6 @@ try { message.acknowledge(); - BasicXaTest.log.info("processed message " + (received++)); } catch (HornetQException e) {