You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/12/13 14:33:53 UTC
svn commit: r486646 - in
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client:
state/StateWaiter.java transport/SocketTransportConnection.java
transport/TransportConnection.java
Author: ritchiem
Date: Wed Dec 13 05:33:52 2006
New Revision: 486646
URL: http://svn.apache.org/viewvc?view=rev&rev=486646
Log:
Minor white space and logging changes
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java?view=diff&rev=486646&r1=486645&r2=486646
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java Wed Dec 13 05:33:52 2006
@@ -46,7 +46,7 @@
public void waituntilStateHasChanged() throws AMQException
{
- synchronized (_monitor)
+ synchronized(_monitor)
{
//
// The guard is required in case we are woken up by a spurious
@@ -71,22 +71,22 @@
_logger.debug("Throwable reached state waiter: " + _throwable);
if (_throwable instanceof AMQException)
{
- throw (AMQException) _throwable;
+ throw(AMQException) _throwable;
}
else
{
- throw new AMQException("Error: " + _throwable, _throwable); // FIXME: this will wrap FailoverException in throwable which will prevent it being caught.
+ throw new AMQException("Error: " + _throwable, _throwable); // FIXME: this will wrap FailoverException in throwable which will prevent it being caught.
}
}
}
public void stateChanged(AMQState oldState, AMQState newState)
{
- synchronized (_monitor)
+ synchronized(_monitor)
{
if (_logger.isDebugEnabled())
{
- _logger.debug("stateChanged called");
+ _logger.debug("stateChanged called changing from :" + oldState + " to :" + newState);
}
if (_state == newState)
{
@@ -103,7 +103,7 @@
public void error(Throwable t)
{
- synchronized (_monitor)
+ synchronized(_monitor)
{
if (_logger.isDebugEnabled())
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java?view=diff&rev=486646&r1=486645&r2=486646
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java Wed Dec 13 05:33:52 2006
@@ -60,6 +60,7 @@
// once more testing of the performance of the simple allocator has been done
if (!Boolean.getBoolean("amqj.enablePooledAllocator"))
{
+ _logger.warn("Using SimpleByteBufferAllocator");
ByteBuffer.setAllocator(new SimpleByteBufferAllocator());
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?view=diff&rev=486646&r1=486645&r2=486646
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java Wed Dec 13 05:33:52 2006
@@ -268,7 +268,7 @@
Object[] params = {port};
provider = (IoHandlerAdapter) Class.forName(protocolProviderClass).getConstructor(cnstr).newInstance(params);
//Give the broker a second to create
- _logger.info("Created Instance");
+ _logger.info("Created VMBroker Instance:" + port);
}
catch (Exception e)
{