diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceSSL/SSLEngine.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java index 7f9ed1de6f5..9d31cca36f5 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java @@ -59,7 +59,7 @@ public class ConnectionFlushBatch extends OutgoingAsyncBase } else if(_instance.queueRequests()) { - status = _instance.getQueueExecutor().executeNoThrow(new Callable<Integer>() + status = _instance.getQueueExecutor().execute(new Callable<Integer>() { @Override public Integer call() throws RetryException diff --git a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java index 50380938751..65f84cd2f74 100644 --- a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -644,9 +644,14 @@ class SSLEngine Certificate[] getVerifiedCertificateChain(Certificate[] chain) { + if(_validator == null) + { + return chain; // The user provided a custom SSLContext + } + if(_validatorParams == null) { - return null; // Couldn't validate the given certificate chain. + return null; // Couldn't validate the given certificate chain, no trust anchors configured. } List<Certificate> certs = new ArrayList<Certificate>(java.util.Arrays.asList(chain)); |