Skip to content

Commit

Permalink
Fixed bug with initialization using SSL system properties.
Browse files Browse the repository at this point in the history
  • Loading branch information
John MacAuley committed Mar 15, 2022
1 parent d476f12 commit dd0b98d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>net.es.nsi</groupId>
<artifactId>dds-lib</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/net/es/nsi/dds/lib/dao/HttpsContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public synchronized void load(SecureType config) throws KeyManagementException,
}

keyStore.setFile(getAbsolutePath(basedir, keyStore.getFile()));
LOG.debug("[HttpsContext].load: keyStore " + keyStore.getFile());
config.setKeyStore(keyStore);

KeyStoreType trustStore = config.getTrustStore();
if (trustStore == null) {
Expand All @@ -117,6 +119,8 @@ public synchronized void load(SecureType config) throws KeyManagementException,
}

trustStore.setFile(getAbsolutePath(basedir, trustStore.getFile()));
LOG.debug("[HttpsContext].load: trustStore " + trustStore.getFile());
config.setTrustStore(trustStore);

// Initialize the SSL context.
sslContext = initContext(config);
Expand Down

0 comments on commit dd0b98d

Please sign in to comment.