archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6748546: javadoc API should be classloader-friendly

Browse source 
Reviewed-by: bpatel
This commit is contained in:
Jonathan Gibbons 2008-10-06 16:57:15 -07:00
parent ebc51f0813
commit 1a0a9d1a6f
3 changed files with 113 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
View file

@ -32,7 +32,6 @@ import static com.sun.javadoc.LanguageVersion.*;
import com.sun.tools.javac.util.List;
import java.net.*;
import java.lang.OutOfMemoryError;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.InvocationTargetException;
@ -70,7 +69,8 @@ public class DocletInvoker {
}
public DocletInvoker(Messager messager,
String docletClassName, String docletPath) {
String docletClassName, String docletPath,
ClassLoader docletParentClassLoader) {
this.messager = messager;
this.docletClassName = docletClassName;
@ -82,7 +82,10 @@ public class DocletInvoker {
cpString = appendPath(System.getProperty("java.class.path"), cpString);
cpString = appendPath(docletPath, cpString);
URL[] urls = pathToURLs(cpString);
appClassLoader = new URLClassLoader(urls);
if (docletParentClassLoader == null)
appClassLoader = new URLClassLoader(urls);
else
appClassLoader = new URLClassLoader(urls, docletParentClassLoader);
// attempt to find doclet
Class dc = null;