Author: rgodfrey
Date: Wed May 6 10:49:50 2015
New Revision: 1677957
URL: http://svn.apache.org/r1677957
Log:
Merge changes from trunk
Modified:
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
Modified:
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java?rev=1677957&r1=1677956&r2=1677957&view=diff
==============================================================================
---
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java
(original)
+++
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TCPTransportProvider.java
Wed May 6 10:49:50 2015
@@ -267,7 +267,7 @@ class TCPTransportProvider implements Tr
catch (IOException e)
{
conn.inputClosed();
- e.printStackTrace();
+ RAW_LOGGER.log(Level.INFO, "IO Error reading from connection", e);
}
}
}
Modified:
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java?rev=1677957&r1=1677956&r2=1677957&view=diff
==============================================================================
---
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
(original)
+++
qpid/branches/0.32.x/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/TransactionController.java
Wed May 6 10:49:50 2015
@@ -113,13 +113,14 @@ public class TransactionController imple
private void waitForResponse() throws LinkDetachedException
{
- synchronized (this)
+ final Object lock = _endpoint.getLock();
+ synchronized (lock)
{
while(!_received && !_endpoint.isDetached())
{
try
{
- wait();
+ lock.wait();
}
catch (InterruptedException e)
{
@@ -133,12 +134,16 @@ public class TransactionController imple
}
}
- private synchronized void remoteDetached(Detach detach)
+ private void remoteDetached(Detach detach)
{
- if(detach != null && detach.getError() != null)
+ final Object lock = _endpoint.getLock();
+ synchronized (lock)
{
- _error = detach.getError();
- notifyAll();
+ if (detach != null && detach.getError() != null)
+ {
+ _error = detach.getError();
+ lock.notifyAll();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
