You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/11/22 18:09:17 UTC
[1/2] qpid-proton-j git commit: PROTON-1972: fix test failures when
using TLSv1.3 / Java11
Repository: qpid-proton-j
Updated Branches:
refs/heads/master c78387ecc -> ae2441fdb
PROTON-1972: fix test failures when using TLSv1.3 / Java11
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/a2029ab8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/a2029ab8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/a2029ab8
Branch: refs/heads/master
Commit: a2029ab82f0e10244272869c0e36cf1803e7f548
Parents: c78387e
Author: Robbie Gemmell <ro...@apache.org>
Authored: Thu Nov 22 18:01:42 2018 +0000
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Thu Nov 22 18:02:55 2018 +0000
----------------------------------------------------------------------
.../proton/engine/impl/ssl/SimpleSslTransportWrapper.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/a2029ab8/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
index f2454b3..ca65f18 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
@@ -106,6 +106,7 @@ public class SimpleSslTransportWrapper implements SslTransportWrapper
*/
private void unwrapInput() throws SSLException
{
+ int prevInRemaining = -1;
while (true) {
SSLEngineResult result = _sslEngine.unwrap(_inputBuffer, _decodedInputBuffer);
logEngineClientModeAndResult(result, "input");
@@ -171,6 +172,14 @@ public class SimpleSslTransportWrapper implements SslTransportWrapper
switch (hstatus)
{
case NEED_WRAP:
+ int inputRemaining = _inputBuffer.remaining();
+ if (inputRemaining > 0 && status == Status.OK && (inputRemaining < prevInRemaining || prevInRemaining < 0)) {
+ // Track remaining input so we break if no progress is made.
+ prevInRemaining = inputRemaining;
+ // Process a wrap, try to progress on the remaining input.
+ pending();
+ continue;
+ }
// wait for write to kick in
break;
case NEED_TASK:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton-j git commit: NO-JIRA: add a Java11 job on TravisCI
Posted by ro...@apache.org.
NO-JIRA: add a Java11 job on TravisCI
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/commit/ae2441fd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/tree/ae2441fd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton-j/diff/ae2441fd
Branch: refs/heads/master
Commit: ae2441fdb4120e220eaca4ff4aca3956c5225914
Parents: a2029ab
Author: Robbie Gemmell <ro...@apache.org>
Authored: Thu Nov 22 18:03:03 2018 +0000
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Thu Nov 22 18:08:59 2018 +0000
----------------------------------------------------------------------
.travis.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton-j/blob/ae2441fd/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 34aca76..cda35b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
language: java
sudo: false
-jdk:
- - openjdk8
+matrix:
+ include:
+ - os: linux
+ jdk: openjdk8
+ - os: linux
+ jdk: openjdk11
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org