This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 4f218dba6d Remove duplication
4f218dba6d is described below
commit 4f218dba6d2aff220c2bd8901b479a2f69d2eac2
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jan 13 10:29:01 2026 +0000
Remove duplication
---
test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java
b/test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java
index 0d9403f68f..74ccdc6f8c 100644
--- a/test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java
+++ b/test/org/apache/tomcat/util/net/ocsp/TestOcspIntegration.java
@@ -282,7 +282,7 @@ public class TestOcspIntegration extends TomcatBaseTest {
File certificateKeyFile = new
File(getPath(SERVER_CERTIFICATE_KEY_PATH));
File certificateChainFile = new File(getPath(CA_CERTIFICATE_PATH));
File truststoreFile = new File(getPath(TRUSTSTORE_PATH));
- String truststorePass = Files.readString(new
File(getPath(CLIENT_KEYSTORE_PASS)).toPath()).trim();
+ String truststorePass = Files.readString(new
File(getPath(TRUSTSTORE_PASS)).toPath()).trim();
initSsl(tomcat, serverSideOcspVerification, useOpenSSLTrust,
certificateFile, certificateKeyFile,
certificateChainFile, truststoreFile, truststorePass);
@@ -293,9 +293,8 @@ public class TestOcspIntegration extends TomcatBaseTest {
context.addServletMappingDecoded("/", "simple");
KeyStore trustStore = KeyStore.getInstance(KEYSTORE_TYPE);
- String trustStorePass = Files.readString(new
File(getPath(TRUSTSTORE_PASS)).toPath()).trim();
trustStore.load(new FileInputStream(new
File(getPath(TRUSTSTORE_PATH)).getAbsolutePath()),
- trustStorePass.toCharArray());
+ truststorePass.toCharArray());
KeyStore clientKeystore = KeyStore.getInstance(KEYSTORE_TYPE);
String clientKeystorePass = Files.readString(new
File(getPath(CLIENT_KEYSTORE_PASS)).toPath()).trim();
clientKeystore.load(new FileInputStream(new
File(getPath(CLIENT_KEYSTORE_PATH)).getAbsolutePath()),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
