Skip to content

Commit 0ec979f

Browse files
committed
Remove duplication
1 parent 3c6a73f commit 0ec979f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private static int testOCSP(Tomcat tomcat, String pathToOcspResponse,
282282
File certificateKeyFile = new File(getPath(SERVER_CERTIFICATE_KEY_PATH));
283283
File certificateChainFile = new File(getPath(CA_CERTIFICATE_PATH));
284284
File truststoreFile = new File(getPath(TRUSTSTORE_PATH));
285-
String truststorePass = Files.readString(new File(getPath(CLIENT_KEYSTORE_PASS)).toPath()).trim();
285+
String truststorePass = Files.readString(new File(getPath(TRUSTSTORE_PASS)).toPath()).trim();
286286
initSsl(tomcat, serverSideOcspVerification, useOpenSSLTrust, certificateFile, certificateKeyFile,
287287
certificateChainFile, truststoreFile, truststorePass);
288288

@@ -293,9 +293,8 @@ private static int testOCSP(Tomcat tomcat, String pathToOcspResponse,
293293
context.addServletMappingDecoded("/", "simple");
294294

295295
KeyStore trustStore = KeyStore.getInstance(KEYSTORE_TYPE);
296-
String trustStorePass = Files.readString(new File(getPath(TRUSTSTORE_PASS)).toPath()).trim();
297296
trustStore.load(new FileInputStream(new File(getPath(TRUSTSTORE_PATH)).getAbsolutePath()),
298-
trustStorePass.toCharArray());
297+
truststorePass.toCharArray());
299298
KeyStore clientKeystore = KeyStore.getInstance(KEYSTORE_TYPE);
300299
String clientKeystorePass = Files.readString(new File(getPath(CLIENT_KEYSTORE_PASS)).toPath()).trim();
301300
clientKeystore.load(new FileInputStream(new File(getPath(CLIENT_KEYSTORE_PATH)).getAbsolutePath()),

0 commit comments

Comments
 (0)