fixed null pointer exception because of too ear...

fixed null pointer exception because of too early =getProject()

1 files changed, 10 insertions, 8 deletions

diff --git a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java b/support/ant/src.java/scala/tools/scalac4ant/AntTask.java
index ab9ad9ee8b..963cc5af17 100644
--- a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java
+++ b/support/ant/src.java/scala/tools/scalac4ant/AntTask.java
@@ -13,6 +13,8 @@ import java.util.*;
  * author: Burak Emir
  * adapted from package jaco.framework.ant.AntCompilerTask
  *  (part of Matthias Zenger's jaco framework)
+ *
+ * $Id$
  */
 
 
@@ -23,16 +25,16 @@ public class AntTask extends Javac {
     private String source = null;
     private String target = null;
     private FileUtils fileUtils = FileUtils.newFileUtils();
-    private Project project = getProject();
 
     public void execute() {
-        String old = project.getProperty("build.compiler");
-        project.setProperty("build.compiler", "scala.tools.scalac4ant.AntAdaptor");
-        super.execute();
-        if (old == null)
-            project.setProperty("build.compiler", "modern");
-        else
-            project.setProperty("build.compiler", old);
+          Project project = getProject();
+          String old = project.getProperty("build.compiler");
+          project.setProperty("build.compiler", "scala.tools.scalac4ant.AntAdaptor");
+          super.execute();
+          if (old == null)
+                project.setProperty("build.compiler", "modern");
+          else
+                project.setProperty("build.compiler", old);
     }
 
     public void setForce(boolean fc) {