You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/04/24 15:46:28 UTC
cxf git commit: Build fix
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 6b9d2d649 -> b12af728a
Build fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b12af728
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b12af728
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b12af728
Branch: refs/heads/3.1.x-fixes
Commit: b12af728a7f136c412ee07ea64616a216a63fd00
Parents: 6b9d2d6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 24 16:46:22 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 24 16:46:22 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/cxf/configuration/jsse/SSLUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b12af728/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 9f911e7..b9c4a44 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -22,11 +22,12 @@ package org.apache.cxf.configuration.jsse;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
@@ -246,7 +247,7 @@ public final class SSLUtils {
new Object[]{trustStoreLocation, e.getMessage()});
}
} else {
- try (FileInputStream trustStoreInputStream = new FileInputStream(trustStoreLocation)) {
+ try (InputStream trustStoreInputStream = Files.newInputStream(Paths.get(trustStoreLocation))) {
trustedCertStore.load(trustStoreInputStream, null);
}
}