rubys 01/03/17 04:41:38
Modified: src/main/org/apache/tools/ant/taskdefs Rmic.java
Log:
Fix for NPE when getClasspath is called before setRmic
Revision Changes Path
1.20 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Rmic.java 2001/03/16 12:57:15 1.19
+++ Rmic.java 2001/03/17 12:41:38 1.20
@@ -366,6 +366,9 @@
String compiler = project.getProperty("build.rmic");
RmicAdapter adapter = RmicAdapterFactory.getRmic(compiler, this );
+
+ // now we need to populate the compiler adapter
+ adapter.setRmic( this );
Path classpath = adapter.getClasspath();
loader = new AntClassLoader(project, classpath);
@@ -388,9 +391,6 @@
log("RMI Compiling " + fileCount +
" class"+ (fileCount > 1 ? "es" : "")+" to " + baseDir,
Project.MSG_INFO);
-
- // now we need to populate the compiler adapter
- adapter.setRmic( this );
// finally, lets execute the compiler!!
if (!adapter.execute()) {
