Include duplicate jar when jarhell check fails

s12v · jasontedor · commit 4ed3fd83df1c · 2017-06-02T18:22:42.000-04:00
When the jarhell check fails due to a duplicate jar on the classpath, the exception message includes the full classpath but not the duplicated jar. For a long classpath, this can make it difficult to find the jar that is duplicated. This commit changes the exception message to include the duplicated jar. Relates #24953
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
@@ -140,7 +140,7 @@ static Set<URL> parseClassPath(String classPath) {
                 URL url = PathUtils.get(element).toUri().toURL();
                 if (urlElements.add(url) == false) {
                     throw new IllegalStateException("jar hell!" + System.lineSeparator() +
-                        "duplicate jar on classpath: " + classPath);
+                        "duplicate jar [" + element + "] on classpath: " + classPath);
                 }
             } catch (MalformedURLException e) {
                 // should not happen, as we use the filesystem API

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static Set<URL> parseClassPath(String classPath) {`
`140`	`140`	`URL url = PathUtils.get(element).toUri().toURL();`
`141`	`141`	`if (urlElements.add(url) == false) {`
`142`	`142`	`throw new IllegalStateException("jar hell!" + System.lineSeparator() +`
`143`		`- "duplicate jar on classpath: " + classPath);`
	`143`	`+ "duplicate jar [" + element + "] on classpath: " + classPath);`
`144`	`144`	`}`
`145`	`145`	`} catch (MalformedURLException e) {`
`146`	`146`	`// should not happen, as we use the filesystem API`