diff options
Diffstat (limited to 'java/common')
3 files changed, 43 insertions, 8 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java b/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java index ee823978b4..8e93a907d6 100644 --- a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java +++ b/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java @@ -443,17 +443,17 @@ public class BindingURLParser for (String url: urls) { - System.out.println("URL " + url); + _logger.info("URL " + url); AMQBindingURL bindingURL = new AMQBindingURL(url); parser.parse(url,bindingURL); - System.out.println("\nX " + bindingURL.toString() + " \n"); + _logger.info("\nX " + bindingURL.toString() + " \n"); } } catch(Exception e) { - e.printStackTrace(); + _logger.error("Error with binding urls", e); } } diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java index 12bbd20228..46d1887496 100644 --- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java +++ b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.transport; +import org.apache.log4j.Logger; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.network.ConnectionBinding; import org.apache.qpid.transport.network.io.IoAcceptor; @@ -41,6 +42,7 @@ import java.util.concurrent.TimeUnit; */ public class ConnectionTest extends QpidTestCase implements SessionListener { + private static final Logger _logger = Logger.getLogger(ConnectionTest.class); private int port; private volatile boolean queue = false; private List<MessageTransfer> messages = new ArrayList<MessageTransfer>(); @@ -155,7 +157,6 @@ public class ConnectionTest extends QpidTestCase implements SessionListener { final Connection conn = new Connection(); conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings())); - conn.addConnectionListener(new ConnectionListener() { public void opened(Connection conn) {} @@ -240,7 +241,6 @@ public class ConnectionTest extends QpidTestCase implements SessionListener } catch (IOException e) { - e.printStackTrace(); fail("Unable to start Server for test due to:" + e.getMessage()); } @@ -349,7 +349,10 @@ public class ConnectionTest extends QpidTestCase implements SessionListener Thread.sleep(6000); send(ssn, "SINK 3"); ssn.sync(); - System.out.println(messages); + if (_logger.isDebugEnabled()) + { + _logger.debug(messages); + } assertEquals(1, messages.size()); assertEquals("SINK 3", messages.get(0).getBodyString()); } diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java index 641bc5fa34..bb864cd434 100644 --- a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java +++ b/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.transport.network.io; +import org.apache.log4j.Logger; import org.apache.qpid.transport.Binding; import org.apache.qpid.transport.TransportException; @@ -38,7 +39,9 @@ import java.nio.ByteBuffer; public class IoAcceptor<E> extends Thread { + private static final Logger _logger = Logger.getLogger(IoAcceptor.class); + private volatile boolean _closed = false; private ServerSocket socket; private Binding<E,ByteBuffer> binding; @@ -59,6 +62,8 @@ public class IoAcceptor<E> extends Thread */ public void close() throws IOException { + _closed = true; + if (!socket.isClosed()) { socket.close(); @@ -73,7 +78,7 @@ public class IoAcceptor<E> extends Thread public void run() { - while (true) + while (!_closed) { try { @@ -82,9 +87,36 @@ public class IoAcceptor<E> extends Thread } catch (IOException e) { - throw new TransportException(e); + if (!_closed) + { + _logger.error("Error in IoAcceptor thread", e); + closeSocketIfNecessary(socket); + try + { + Thread.sleep(1000); + } + catch (InterruptedException ie) + { + _logger.debug("Stopping io acceptor due to interrupt request"); + _closed = true; + } + } } } } + private void closeSocketIfNecessary(final ServerSocket socket) + { + if(socket != null) + { + try + { + socket.close(); + } + catch (IOException e) + { + _logger.debug("Exception while closing socket", e); + } + } + } } |