Skip to content

Commit

Permalink
Avoid Illegal reflective access warnings with devtools
Browse files Browse the repository at this point in the history
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See spring-projects/spring-framework#26403

Closes gh-24857
  • Loading branch information
snicoll committed Feb 11, 2021
1 parent 698672e commit 75fc896
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,6 +22,7 @@
import java.net.URLClassLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.Enumeration;

import org.apache.commons.logging.Log;
Expand Down Expand Up @@ -167,6 +168,11 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
});
}

@Override
public Class<?> publicDefineClass(String name, byte[] b, ProtectionDomain protectionDomain) {
return defineClass(name, b, 0, b.length, protectionDomain);
}

private URL createFileUrl(String name, ClassLoaderFile file) {
try {
return new URL("reloaded", null, -1, "/" + name, new ClassLoaderFileURLStreamHandler(file));
Expand Down
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -25,6 +25,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
Expand All @@ -34,6 +35,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import org.springframework.aop.framework.ProxyFactory;
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.StreamUtils;
Expand Down Expand Up @@ -200,6 +202,14 @@ void getAddedClass() throws Exception {
assertThat(loaded.getClassLoader()).isEqualTo(this.reloadClassLoader);
}

@Test
void proxyOnClassFromSystemClassLoaderDoesNotYieldWarning() {
ProxyFactory pf = new ProxyFactory(new HashMap<>());
pf.setProxyTargetClass(true);
pf.getProxy(this.reloadClassLoader);
// Warning would happen outside the boundary of the test
}

private String readString(InputStream in) throws IOException {
return new String(FileCopyUtils.copyToByteArray(in));
}
Expand Down

0 comments on commit 75fc896

Please sign in to comment.