From b18b40b1524d7c536ddef35aff1a8afd12fb0868 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 4 Aug 2000 10:08:03 +0000
Subject: [PATCH] Moved the javadoc == 1.1 or 1.2 check out of init().

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267884 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 52dcd7b09..a67e67304 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -160,7 +160,9 @@ public class Javadoc extends Task {
     }
 
     private Commandline cmd = new Commandline();
-    private boolean javadoc1 = true;
+    private static boolean javadoc1 = 
+        (Project.getJavaVersion() == Project.JAVA_1_1);
+
 
     private void addArgIf(boolean b, String arg) {
         if (b) {
@@ -493,11 +495,6 @@ public class Javadoc extends Task {
         }
     }
 
-    public void init() {
-        cmd.setExecutable("javadoc");
-        javadoc1 = (Project.getJavaVersion() == Project.JAVA_1_1);
-    }
-
     public void execute() throws BuildException {
         if ("javadoc2".equals(taskType)) {
             log("!! javadoc2 is deprecated. Use javadoc instead. !!");
@@ -510,6 +507,8 @@ public class Javadoc extends Task {
 
         log("Generating Javadoc", Project.MSG_INFO);
 
+        cmd.setExecutable("javadoc");
+
 // ------------------------------------------------ general javadoc arguments
         if (classpath == null)
             classpath = Path.systemClasspath;