Bugzilla bug 130810.merge_src_20060308-2330

https://bugs.eclipse.org/bugs/show_bug.cgi?id=130810

Need batch classloader to be a child of the iterative classloader so that all classes within the factory path are visible at runtime.

1 files changed, 7 insertions, 1 deletions

diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java
index 534c8d52dd..650d8c1c2a 100644
--- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java
+++ b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java
@@ -730,8 +730,14 @@ public class AnnotationProcessorFactoryLoader {
 			}
 		}
 		
+		// Try to use the iterative CL as parent, so we can resolve classes within it
+		ClassLoader parentCL = _iterativeLoaders.get(p);
+		if (parentCL == null) {
+			parentCL = AnnotationProcessorFactoryLoader.class.getClassLoader();
+		}
+		
 		if ( fileList.size() > 0 ) {
-			_batchLoaders.put(p,createClassLoader( fileList, AnnotationProcessorFactoryLoader.class.getClassLoader()));
+			_batchLoaders.put(p,createClassLoader( fileList, parentCL));
 		}
 	}