Improve keystore exception message when keystore is not valid (#4759)

Signed-off-by: Michael Mayer <michael@schnittstabil.de>
jetty · Apr 8, 2020 · a640701 · a640701
1 parent 3981ec1
commit a640701
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateUtils.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/CertificateUtils.java
@@ -47,7 +47,7 @@ public static KeyStore getKeyStore(Resource store, String storeType, String stor
             }
 
             if (!store.exists())
-                throw new IllegalStateException("no valid keystore");
+                throw new IllegalStateException(store.getName() + " is not a valid keystore");
 
             try (InputStream inStream = store.getInputStream())
             {

diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
@@ -217,7 +217,7 @@ public void testNoKeyConfig()
                 cf.setTrustStorePath("/foo");
                 cf.start();
             });
-            assertThat(x.getMessage(), containsString("no valid keystore"));
+            assertThat(x.getMessage(), equalTo("/foo is not a valid keystore"));
         }
     }