From 0dd985bc2a3584f478eebc7c1a25f24aa559f1ac Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Fri, 4 Aug 2000 10:23:25 +0000
Subject: [PATCH] Add some eror checking to the syntax of the linkoffline
 attribute Fix the output of argument list under verbose logging (Thanks to
 Ken Wood)

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

diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index a67e67304..f04306787 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -365,8 +365,17 @@ public class Javadoc extends Task {
         if (!javadoc1) {
             LinkArgument le = createLink();
             le.setOffline(true);
+            String linkOfflineError = "The linkoffline attribute must include a URL and " + 
+                                      "a package-list file location separated by a space";
+            if (src.trim().length() == 0) {
+                throw new BuildException(linkOfflineError);
+            }                
             StringTokenizer tok = new StringTokenizer(src, " ", false);
             le.setHref(tok.nextToken());
+
+            if (!tok.hasMoreTokens()) {
+                throw new BuildException(linkOfflineError);
+            }                                        
             le.setPackagelistLoc(tok.nextToken());
         }
     }
@@ -661,7 +670,7 @@ public class Javadoc extends Task {
          if (packageList != null) {
             cmd.createArgument().setValue("@" + packageList);
         }
-        log("Javadoc args: " + cmd.getArguments(), Project.MSG_VERBOSE);
+        log("Javadoc args: " + cmd, Project.MSG_VERBOSE);
 
         log("Javadoc execution", Project.MSG_INFO);