Skip to content

Commit 539ba9b

Browse files
committed
minor refactor: remove URL constructor deprecation warnings (cont'd)
1 parent e8ad13a commit 539ba9b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/main/java/groovy/lang/GroovyClassLoader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ public Class defineClass(final String name, final byte[] bytes) throws ClassForm
218218
public Class defineClass(final ClassNode classNode, final String file, final String newCodeBase) {
219219
CodeSource codeSource = null;
220220
try {
221-
codeSource = new CodeSource(new URI("file", "", newCodeBase, null).toURL(), (java.security.cert.Certificate[]) null);
221+
String path = newCodeBase.startsWith("/") ? newCodeBase : "/" + newCodeBase;
222+
codeSource = new CodeSource(new URI("file", "", path, null).toURL(), (java.security.cert.Certificate[]) null);
222223
} catch (MalformedURLException | URISyntaxException ignore) {
223224
}
224225

src/main/java/groovy/lang/GroovyCodeSource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ private static CodeSource createCodeSource(final String codeBase) {
232232
sm.checkPermission(new GroovyCodeSourcePermission(codeBase));
233233
}
234234
try {
235-
return new CodeSource(new URI("file", "", codeBase, null).toURL(), (java.security.cert.Certificate[]) null);
235+
String path = codeBase.startsWith("/") ? codeBase : "/" + codeBase;
236+
return new CodeSource(new URI("file", "", path, null).toURL(), (java.security.cert.Certificate[]) null);
236237
}
237238
catch (MalformedURLException | URISyntaxException e) {
238239
throw new RuntimeException("A CodeSource file URL cannot be constructed from the supplied codeBase: " + codeBase);

0 commit comments

Comments
 (0)