Author: rgodfrey
Date: Fri Nov 13 16:45:10 2015
New Revision: 1714237
URL: http://svn.apache.org/viewvc?rev=1714237&view=rev
Log:
QPID-6480 : Address review comments from [~lorenz.quack]
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1714237&r1=1714236&r2=1714237&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
Fri Nov 13 16:45:10 2015
@@ -72,7 +72,7 @@ public class NonBlockingConnection imple
private volatile boolean _unexpectedByteBufferSizeReported;
private final String _threadName;
private volatile SelectorThread.SelectionTask _selectionTask;
- private Iterator<Runnable> _pendingItertor;
+ private Iterator<Runnable> _pendingIterator;
public NonBlockingConnection(SocketChannel socketChannel,
ProtocolEngine protocolEngine,
@@ -213,12 +213,12 @@ public class NonBlockingConnection imple
}
}
- public boolean wantsRead()
+ boolean wantsRead()
{
return _fullyWritten;
}
- public boolean wantsWrite()
+ boolean wantsWrite()
{
return !_fullyWritten;
}
@@ -245,32 +245,33 @@ public class NonBlockingConnection imple
_protocolEngine.setIOThread(Thread.currentThread());
_protocolEngine.setMessageAssignmentSuspended(true);
- if(_pendingItertor == null)
+ if(_pendingIterator == null)
{
- _pendingItertor = _protocolEngine.processPendingIterator();
+ _pendingIterator =
_protocolEngine.processPendingIterator();
}
- while(_pendingItertor.hasNext())
+ while(_pendingIterator.hasNext())
{
long size = getBufferedSize();
if(size >= _port.getNetworkBufferSize())
{
doWrite();
- if((size - getBufferedSize()) <
(_port.getNetworkBufferSize()/2))
+ long bytesWritten = size - getBufferedSize();
+ if(bytesWritten < (_port.getNetworkBufferSize()/2))
{
break;
}
}
else
{
- final Runnable task = _pendingItertor.next();
+ final Runnable task = _pendingIterator.next();
task.run();
}
}
- if (!_pendingItertor.hasNext())
+ if (!_pendingIterator.hasNext())
{
- _pendingItertor = null;
+ _pendingIterator = null;
_protocolEngine.setTransportBlockedForWriting(false);
boolean dataRead = doRead();
_protocolEngine.setTransportBlockedForWriting(!doWrite());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
