Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch '1.4' into 1.5 #390

Merged
merged 3 commits into from
Jul 14, 2017
Merged

Merge branch '1.4' into 1.5 #390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a78e441
changed TLSSocketChannel#wrap to agressively do channelWrite upon BUF…
ali-ince Jul 12, 2017
8935542
Merge pull request #389 from ali-ince/1.1-tlschannel-enlarge-buffer-fix
ali-ince Jul 14, 2017
0e16f45
Merge branch '1.4' into 1.5
ali-ince Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,22 @@ private HandshakeStatus wrap( ByteBuffer buffer ) throws IOException, ClientExce
}
else
{
logger.debug( "Network output buffer doesn't need enlarging, flushing data to the channel instead to open up space on the buffer." );
// flush as much data as possible
cipherOut.flip();
if ( channelWrite( cipherOut ) == 0 )
{
throw new ClientException( format(
"Failed to enlarge network buffer from %s to %s. This is either because the " +
"new size is however less than the old size, or because the application " +
"buffer size %s is so big that the application data still cannot fit into the " +
"new network buffer.", curNetSize, netSize, buffer.capacity() ) );
while ( cipherOut.hasRemaining() ) {
int written = channelWrite( cipherOut );

if (written > 0) {
break;
}

logger.debug( "having difficulty flushing data (network contention on local computer?). will continue trying after yielding execution." );
Thread.yield();

logger.debug( "nothing written to the underlying channel (network output buffer is full?), will try till we can." );
}
cipherOut.compact();
logger.debug( "Network output buffer couldn't be enlarged, flushing data to the channel instead." );
}
break;
default:
Expand Down