QPID-832 : Fix eol-style

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@651325 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 558 insertions, 558 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
index a5279a195b..1738db7239 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
@@ -1,104 +1,104 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-package org.apache.qpid.test.unit.basic;

-

-import org.apache.qpid.client.AMQConnection;

-import org.apache.qpid.client.AMQQueue;

-import org.apache.qpid.testutil.QpidTestCase;

-

-import javax.jms.Session;

-import javax.jms.QueueSession;

-import javax.jms.Queue;

-import javax.jms.QueueSender;

-import javax.jms.TextMessage;

-import javax.jms.InvalidDestinationException;

-

-public class InvalidDestinationTest extends QpidTestCase

-{

-    private AMQConnection _connection;

-

-    protected void setUp() throws Exception

-    {

-        super.setUp();

-        _connection = (AMQConnection) getConnection("guest", "guest");

-    }

-

-    protected void tearDown() throws Exception

-    {

-        _connection.close();

-        super.tearDown();

-    }

-

-

-

-    public void testInvalidDestination() throws Exception

-    {

-        Queue invalidDestination = new AMQQueue("amq.direct","unknownQ");

-        AMQQueue validDestination = new AMQQueue("amq.direct","knownQ");

-        QueueSession queueSession = _connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);

-

-        // This is the only easy way to create and bind a queue from the API :-(

-        queueSession.createConsumer(validDestination);

-

-        QueueSender sender = queueSession.createSender(invalidDestination);

-        TextMessage msg = queueSession.createTextMessage("Hello");

-        try

-        {

-            sender.send(msg);

-            fail("Expected InvalidDestinationException");

-        }

-        catch (InvalidDestinationException ex)

-        {

-            // pass

-        }

-        sender.close();

-

-        sender = queueSession.createSender(null);

-        invalidDestination = new AMQQueue("amq.direct","unknownQ");

-

-        try

-        {

-            sender.send(invalidDestination,msg);

-            fail("Expected InvalidDestinationException");

-        }

-        catch (InvalidDestinationException ex)

-        {

-            // pass

-        }

-        sender.send(validDestination,msg);

-        sender.close();

-        validDestination = new AMQQueue("amq.direct","knownQ");

-        sender = queueSession.createSender(validDestination);

-        sender.send(msg);

-

-

-

-

-    }

-

-

-    public static junit.framework.Test suite()

-    {

-

-        return new junit.framework.TestSuite(InvalidDestinationTest.class);

-    }

-}

+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.unit.basic;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.testutil.QpidTestCase;
+
+import javax.jms.Session;
+import javax.jms.QueueSession;
+import javax.jms.Queue;
+import javax.jms.QueueSender;
+import javax.jms.TextMessage;
+import javax.jms.InvalidDestinationException;
+
+public class InvalidDestinationTest extends QpidTestCase
+{
+    private AMQConnection _connection;
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        _connection = (AMQConnection) getConnection("guest", "guest");
+    }
+
+    protected void tearDown() throws Exception
+    {
+        _connection.close();
+        super.tearDown();
+    }
+
+
+
+    public void testInvalidDestination() throws Exception
+    {
+        Queue invalidDestination = new AMQQueue("amq.direct","unknownQ");
+        AMQQueue validDestination = new AMQQueue("amq.direct","knownQ");
+        QueueSession queueSession = _connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // This is the only easy way to create and bind a queue from the API :-(
+        queueSession.createConsumer(validDestination);
+
+        QueueSender sender = queueSession.createSender(invalidDestination);
+        TextMessage msg = queueSession.createTextMessage("Hello");
+        try
+        {
+            sender.send(msg);
+            fail("Expected InvalidDestinationException");
+        }
+        catch (InvalidDestinationException ex)
+        {
+            // pass
+        }
+        sender.close();
+
+        sender = queueSession.createSender(null);
+        invalidDestination = new AMQQueue("amq.direct","unknownQ");
+
+        try
+        {
+            sender.send(invalidDestination,msg);
+            fail("Expected InvalidDestinationException");
+        }
+        catch (InvalidDestinationException ex)
+        {
+            // pass
+        }
+        sender.send(validDestination,msg);
+        sender.close();
+        validDestination = new AMQQueue("amq.direct","knownQ");
+        sender = queueSession.createSender(validDestination);
+        sender.send(msg);
+
+
+
+
+    }
+
+
+    public static junit.framework.Test suite()
+    {
+
+        return new junit.framework.TestSuite(InvalidDestinationTest.class);
+    }
+}
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
index 34197f2608..46b99fac8d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
@@ -1,221 +1,221 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-package org.apache.qpid.test.unit.client.temporaryqueue;

-

-import javax.jms.Connection;

-import javax.jms.JMSException;

-import javax.jms.MessageConsumer;

-import javax.jms.MessageProducer;

-import javax.jms.Session;

-import javax.jms.TemporaryQueue;

-import javax.jms.TextMessage;

-import junit.framework.Assert;

-

-import org.apache.qpid.testutil.QpidTestCase;

-import org.apache.qpid.client.AMQQueue;

-import org.apache.qpid.client.transport.TransportConnection;

-

-import java.util.List;

-import java.util.LinkedList;

-

-public class TemporaryQueueTest extends QpidTestCase

-{

-    protected void setUp() throws Exception

-    {

-        super.setUp();

-    }

-

-    protected void tearDown() throws Exception

-    {

-       super.tearDown();

-    }

-

-    protected Connection createConnection() throws Exception

-    {

-        return  getConnection("guest", "guest");

-    }

-

-    public void testTempoaryQueue() throws Exception

-    {

-        Connection conn = createConnection();

-        Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

-        TemporaryQueue queue = session.createTemporaryQueue();

-        assertNotNull(queue);

-        MessageProducer producer = session.createProducer(queue);

-        MessageConsumer consumer = session.createConsumer(queue);

-        conn.start();

-        producer.send(session.createTextMessage("hello"));

-        TextMessage tm = (TextMessage) consumer.receive(2000);

-        assertNotNull(tm);

-        assertEquals("hello", tm.getText());

-

-        try

-        {

-            queue.delete();

-            fail("Expected JMSException : should not be able to delete while there are active consumers");

-        }

-        catch (JMSException je)

-        {

-            ; //pass

-        }

-

-        consumer.close();

-

-        try

-        {

-            queue.delete();

-        }

-        catch (JMSException je)

-        {

-            fail("Unexpected Exception: " + je.getMessage());

-        }

-

-        conn.close();

-    }

-

-    public void tUniqueness() throws Exception

-    {

-        int numProcs = Runtime.getRuntime().availableProcessors();

-        final int threadsProc = 5;

-

-        runUniqueness(1, 10);

-        runUniqueness(numProcs * threadsProc, 10);

-        runUniqueness(numProcs * threadsProc, 100);

-        runUniqueness(numProcs * threadsProc, 500);

-    }

-

-    void runUniqueness(int makers, int queues) throws Exception

-    {

-        Connection connection = createConnection();

-

-        Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);

-

-        List<TempQueueMaker> tqList = new LinkedList<TempQueueMaker>();

-

-        //Create Makers

-        for (int m = 0; m < makers; m++)

-        {

-            tqList.add(new TempQueueMaker(session, queues));

-        }

-

-

-        List<Thread> threadList = new LinkedList<Thread>();

-

-        //Create Makers

-        for (TempQueueMaker maker : tqList)

-        {

-            threadList.add(new Thread(maker));

-        }

-

-        //Start threads

-        for (Thread thread : threadList)

-        {

-            thread.start();

-        }

-

-        // Join Threads

-        for (Thread thread : threadList)

-        {

-            try

-            {

-                thread.join();

-            }

-            catch (InterruptedException e)

-            {

-                fail("Couldn't correctly join threads");

-            }

-        }

-

-

-        List<AMQQueue> list = new LinkedList<AMQQueue>();

-

-        // Test values

-        for (TempQueueMaker maker : tqList)

-        {

-            check(maker, list);

-        }

-

-        Assert.assertEquals("Not enough queues made.", makers * queues, list.size());

-

-        connection.close();

-    }

-

-    private void check(TempQueueMaker tq, List<AMQQueue> list)

-    {

-        for (AMQQueue q : tq.getList())

-        {

-            if (list.contains(q))

-            {

-                fail(q + " already exists.");

-            }

-            else

-            {

-                list.add(q);

-            }

-        }

-    }

-

-

-    class TempQueueMaker implements Runnable

-    {

-        List<AMQQueue> _queues;

-        Session _session;

-        private int _count;

-

-

-        TempQueueMaker(Session session, int queues) throws JMSException

-        {

-            _queues = new LinkedList<AMQQueue>();

-

-            _count = queues;

-

-            _session = session;

-        }

-

-        public void run()

-        {

-            int i = 0;

-            try

-            {

-                for (; i < _count; i++)

-                {

-                    _queues.add((AMQQueue) _session.createTemporaryQueue());

-                }

-            }

-            catch (JMSException jmse)

-            {

-                //stop

-            }

-        }

-

-        List<AMQQueue> getList()

-        {

-            return _queues;

-        }

-    }

-

-

-    public static junit.framework.Test suite()

-    {

-        return new junit.framework.TestSuite(TemporaryQueueTest.class);

-    }

-}

+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.unit.client.temporaryqueue;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TextMessage;
+import junit.framework.Assert;
+
+import org.apache.qpid.testutil.QpidTestCase;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.transport.TransportConnection;
+
+import java.util.List;
+import java.util.LinkedList;
+
+public class TemporaryQueueTest extends QpidTestCase
+{
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception
+    {
+       super.tearDown();
+    }
+
+    protected Connection createConnection() throws Exception
+    {
+        return  getConnection("guest", "guest");
+    }
+
+    public void testTempoaryQueue() throws Exception
+    {
+        Connection conn = createConnection();
+        Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        TemporaryQueue queue = session.createTemporaryQueue();
+        assertNotNull(queue);
+        MessageProducer producer = session.createProducer(queue);
+        MessageConsumer consumer = session.createConsumer(queue);
+        conn.start();
+        producer.send(session.createTextMessage("hello"));
+        TextMessage tm = (TextMessage) consumer.receive(2000);
+        assertNotNull(tm);
+        assertEquals("hello", tm.getText());
+
+        try
+        {
+            queue.delete();
+            fail("Expected JMSException : should not be able to delete while there are active consumers");
+        }
+        catch (JMSException je)
+        {
+            ; //pass
+        }
+
+        consumer.close();
+
+        try
+        {
+            queue.delete();
+        }
+        catch (JMSException je)
+        {
+            fail("Unexpected Exception: " + je.getMessage());
+        }
+
+        conn.close();
+    }
+
+    public void tUniqueness() throws Exception
+    {
+        int numProcs = Runtime.getRuntime().availableProcessors();
+        final int threadsProc = 5;
+
+        runUniqueness(1, 10);
+        runUniqueness(numProcs * threadsProc, 10);
+        runUniqueness(numProcs * threadsProc, 100);
+        runUniqueness(numProcs * threadsProc, 500);
+    }
+
+    void runUniqueness(int makers, int queues) throws Exception
+    {
+        Connection connection = createConnection();
+
+        Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+        List<TempQueueMaker> tqList = new LinkedList<TempQueueMaker>();
+
+        //Create Makers
+        for (int m = 0; m < makers; m++)
+        {
+            tqList.add(new TempQueueMaker(session, queues));
+        }
+
+
+        List<Thread> threadList = new LinkedList<Thread>();
+
+        //Create Makers
+        for (TempQueueMaker maker : tqList)
+        {
+            threadList.add(new Thread(maker));
+        }
+
+        //Start threads
+        for (Thread thread : threadList)
+        {
+            thread.start();
+        }
+
+        // Join Threads
+        for (Thread thread : threadList)
+        {
+            try
+            {
+                thread.join();
+            }
+            catch (InterruptedException e)
+            {
+                fail("Couldn't correctly join threads");
+            }
+        }
+
+
+        List<AMQQueue> list = new LinkedList<AMQQueue>();
+
+        // Test values
+        for (TempQueueMaker maker : tqList)
+        {
+            check(maker, list);
+        }
+
+        Assert.assertEquals("Not enough queues made.", makers * queues, list.size());
+
+        connection.close();
+    }
+
+    private void check(TempQueueMaker tq, List<AMQQueue> list)
+    {
+        for (AMQQueue q : tq.getList())
+        {
+            if (list.contains(q))
+            {
+                fail(q + " already exists.");
+            }
+            else
+            {
+                list.add(q);
+            }
+        }
+    }
+
+
+    class TempQueueMaker implements Runnable
+    {
+        List<AMQQueue> _queues;
+        Session _session;
+        private int _count;
+
+
+        TempQueueMaker(Session session, int queues) throws JMSException
+        {
+            _queues = new LinkedList<AMQQueue>();
+
+            _count = queues;
+
+            _session = session;
+        }
+
+        public void run()
+        {
+            int i = 0;
+            try
+            {
+                for (; i < _count; i++)
+                {
+                    _queues.add((AMQQueue) _session.createTemporaryQueue());
+                }
+            }
+            catch (JMSException jmse)
+            {
+                //stop
+            }
+        }
+
+        List<AMQQueue> getList()
+        {
+            return _queues;
+        }
+    }
+
+
+    public static junit.framework.Test suite()
+    {
+        return new junit.framework.TestSuite(TemporaryQueueTest.class);
+    }
+}
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index d25986d991..54b2ee95f4 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
@@ -1,144 +1,144 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-package org.apache.qpid.test.unit.close;

-

-import junit.framework.Assert;

-

-import org.apache.qpid.client.AMQConnection;

-import org.apache.qpid.client.transport.TransportConnection;

-import org.apache.qpid.testutil.QpidTestCase;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

-import org.apache.qpid.junit.concurrency.TestRunnable;

-import org.apache.qpid.junit.concurrency.ThreadTestCoordinator;

-

-import javax.jms.Connection;

-import javax.jms.Message;

-import javax.jms.MessageListener;

-import javax.jms.Session;

-

-/**

- * This test forces the situation where a session is closed whilst a message consumer is still in its onMessage method.

- * Running in AUTO_ACK mode, the close call ought to wait until the onMessage method completes, and the ack is sent

- * before closing the connection.

- *

- * <p><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <th> Collaborations <tr><td> Check that

- * closing a connection whilst handling a message, blocks till completion of the handler. </table>

- */

-public class CloseBeforeAckTest extends QpidTestCase

-{

-    private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class);

-

-    Connection connection;

-    Session session;

-    public static final String TEST_QUEUE_NAME = "TestQueue";

-    private int TEST_COUNT = 25;

-

-    class TestThread1 extends TestRunnable implements MessageListener

-    {

-        public void runWithExceptions() throws Exception

-        {

-            // Set this up to listen for message on the test session.

-            session.createConsumer(session.createQueue(TEST_QUEUE_NAME)).setMessageListener(this);

-        }

-

-        public void onMessage(Message message)

-        {

-            // Give thread 2 permission to close the session.

-            allow(new int[] { 1 });

-

-            // Wait until thread 2 has closed the connection, or is blocked waiting for this to complete.

-            waitFor(new int[] { 1 }, true);

-        }

-    }

-

-    TestThread1 testThread1 = new TestThread1();

-

-    TestRunnable testThread2 =

-        new TestRunnable()

-        {

-            public void runWithExceptions() throws Exception

-            {

-                // Send a message to be picked up by thread 1.

-                session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),

-                    session.createTextMessage("Hi there thread 1!"));

-

-                // Wait for thread 1 to pick up the message and give permission to continue.

-                waitFor(new int[] { 0 }, false);

-

-                // Close the connection.

-                session.close();

-

-                // Allow thread 1 to continue to completion, if it is erronously still waiting.

-                allow(new int[] { 1 });

-            }

-        };

-

-    public void testCloseBeforeAutoAck_QPID_397() throws Exception

-    {

-        // Create a session in auto acknowledge mode. This problem shows up in auto acknowledge if the client acks

-        // message at the end of the onMessage method, after a close has been sent.

-        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

-

-        ThreadTestCoordinator tt = new ThreadTestCoordinator(2);

-

-        tt.addTestThread(testThread1, 0);

-        tt.addTestThread(testThread2, 1);

-        tt.setDeadlockTimeout(500);

-        tt.run();

-

-        String errorMessage = tt.joinAndRetrieveMessages();

-

-        // Print any error messages or exceptions.

-        log.debug(errorMessage);

-

-        if (!tt.getExceptions().isEmpty())

-        {

-            for (Exception e : tt.getExceptions())

-            {

-                log.debug("Exception thrown during test thread: ", e);

-            }

-        }

-

-        Assert.assertTrue(errorMessage, "".equals(errorMessage));

-    }

-

-    public void closeBeforeAutoAckManyTimes() throws Exception

-    {

-        for (int i = 0; i < TEST_COUNT; i++)

-        {

-            testCloseBeforeAutoAck_QPID_397();

-        }

-    }

-

-    protected void setUp() throws Exception

-    {

-        super.setUp();

-        connection =  getConnection("guest", "guest");

-    }

-

-    protected void tearDown() throws Exception

-    {

-        super.tearDown();

-    }

-}

+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.unit.close;
+
+import junit.framework.Assert;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.junit.concurrency.TestRunnable;
+import org.apache.qpid.junit.concurrency.ThreadTestCoordinator;
+
+import javax.jms.Connection;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Session;
+
+/**
+ * This test forces the situation where a session is closed whilst a message consumer is still in its onMessage method.
+ * Running in AUTO_ACK mode, the close call ought to wait until the onMessage method completes, and the ack is sent
+ * before closing the connection.
+ *
+ * <p><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <th> Collaborations <tr><td> Check that
+ * closing a connection whilst handling a message, blocks till completion of the handler. </table>
+ */
+public class CloseBeforeAckTest extends QpidTestCase
+{
+    private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class);
+
+    Connection connection;
+    Session session;
+    public static final String TEST_QUEUE_NAME = "TestQueue";
+    private int TEST_COUNT = 25;
+
+    class TestThread1 extends TestRunnable implements MessageListener
+    {
+        public void runWithExceptions() throws Exception
+        {
+            // Set this up to listen for message on the test session.
+            session.createConsumer(session.createQueue(TEST_QUEUE_NAME)).setMessageListener(this);
+        }
+
+        public void onMessage(Message message)
+        {
+            // Give thread 2 permission to close the session.
+            allow(new int[] { 1 });
+
+            // Wait until thread 2 has closed the connection, or is blocked waiting for this to complete.
+            waitFor(new int[] { 1 }, true);
+        }
+    }
+
+    TestThread1 testThread1 = new TestThread1();
+
+    TestRunnable testThread2 =
+        new TestRunnable()
+        {
+            public void runWithExceptions() throws Exception
+            {
+                // Send a message to be picked up by thread 1.
+                session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),
+                    session.createTextMessage("Hi there thread 1!"));
+
+                // Wait for thread 1 to pick up the message and give permission to continue.
+                waitFor(new int[] { 0 }, false);
+
+                // Close the connection.
+                session.close();
+
+                // Allow thread 1 to continue to completion, if it is erronously still waiting.
+                allow(new int[] { 1 });
+            }
+        };
+
+    public void testCloseBeforeAutoAck_QPID_397() throws Exception
+    {
+        // Create a session in auto acknowledge mode. This problem shows up in auto acknowledge if the client acks
+        // message at the end of the onMessage method, after a close has been sent.
+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        ThreadTestCoordinator tt = new ThreadTestCoordinator(2);
+
+        tt.addTestThread(testThread1, 0);
+        tt.addTestThread(testThread2, 1);
+        tt.setDeadlockTimeout(500);
+        tt.run();
+
+        String errorMessage = tt.joinAndRetrieveMessages();
+
+        // Print any error messages or exceptions.
+        log.debug(errorMessage);
+
+        if (!tt.getExceptions().isEmpty())
+        {
+            for (Exception e : tt.getExceptions())
+            {
+                log.debug("Exception thrown during test thread: ", e);
+            }
+        }
+
+        Assert.assertTrue(errorMessage, "".equals(errorMessage));
+    }
+
+    public void closeBeforeAutoAckManyTimes() throws Exception
+    {
+        for (int i = 0; i < TEST_COUNT; i++)
+        {
+            testCloseBeforeAutoAck_QPID_397();
+        }
+    }
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        connection =  getConnection("guest", "guest");
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+}
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
index 0b9d0bdc2d..131cbd5f68 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
@@ -1,89 +1,89 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-package org.apache.qpid.test.unit.message;

-

-import org.apache.qpid.client.AMQConnection;

-import org.apache.qpid.client.AMQQueue;

-import org.apache.qpid.client.AMQSession;

-import org.apache.qpid.framing.AMQShortString;

-import org.apache.qpid.testutil.QpidTestCase;

-

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-

-import javax.jms.Connection;

-import javax.jms.MessageConsumer;

-import javax.jms.MessageProducer;

-import javax.jms.Queue;

-import javax.jms.Session;

-import javax.jms.TextMessage;

-

-/**

- * @author Apache Software Foundation

- */

-public class JMSDestinationTest extends QpidTestCase

-{

-    private static final Logger _logger = LoggerFactory.getLogger(JMSDestinationTest.class);

-

-

-    protected void setUp() throws Exception

-    {

-        super.setUp();

-    }

-

-    protected void tearDown() throws Exception

-    {

-        super.tearDown();

-    }

-

-    public void testJMSDestination() throws Exception

-    {

-        AMQConnection con =  (AMQConnection) getConnection("guest", "guest");

-        AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);

-        Queue queue =

-            new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,

-                true);

-        MessageConsumer consumer = consumerSession.createConsumer(queue);

-

-        Connection con2 =  (AMQConnection) getConnection("guest", "guest");

-        Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);

-        MessageProducer producer = producerSession.createProducer(queue);

-

-        TextMessage sentMsg = producerSession.createTextMessage("hello");

-        assertNull(sentMsg.getJMSDestination());

-

-        producer.send(sentMsg);

-

-        assertEquals(sentMsg.getJMSDestination(), queue);

-

-        con2.close();

-

-        con.start();

-

-        TextMessage rm = (TextMessage) consumer.receive();

-        assertNotNull(rm);

-

-        assertEquals(rm.getJMSDestination(), queue);

-        con.close();

-    }

-

-}

+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.test.unit.message;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.testutil.QpidTestCase;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+/**
+ * @author Apache Software Foundation
+ */
+public class JMSDestinationTest extends QpidTestCase
+{
+    private static final Logger _logger = LoggerFactory.getLogger(JMSDestinationTest.class);
+
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    public void testJMSDestination() throws Exception
+    {
+        AMQConnection con =  (AMQConnection) getConnection("guest", "guest");
+        AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        Queue queue =
+            new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,
+                true);
+        MessageConsumer consumer = consumerSession.createConsumer(queue);
+
+        Connection con2 =  (AMQConnection) getConnection("guest", "guest");
+        Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+        MessageProducer producer = producerSession.createProducer(queue);
+
+        TextMessage sentMsg = producerSession.createTextMessage("hello");
+        assertNull(sentMsg.getJMSDestination());
+
+        producer.send(sentMsg);
+
+        assertEquals(sentMsg.getJMSDestination(), queue);
+
+        con2.close();
+
+        con.start();
+
+        TextMessage rm = (TextMessage) consumer.receive();
+        assertNotNull(rm);
+
+        assertEquals(rm.getJMSDestination(), queue);
+        con.close();
+    }
+
+}