From 7719d03ac2bfbda10f4704d7d73e2a868430b68b Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Tue, 2 Jan 2007 00:11:48 +0000
Subject: [PATCH] Bugzilla 41268: rollback 32927

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@491717 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                            | 4 ++++
 docs/manual/CoreTasks/javadoc.html                  | 5 +++--
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 67bf04a45..2df1078af 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -24,6 +24,10 @@ Fixed bugs:
   and expands properties if expandproperties is false.
   Bugzilla report 41204.
 
+* Rolling back Bugzilla 32927 (set a default description for a javadoc tag
+  if not set) as it caused a BC problem.
+  Bugzilla report 41268.
+
 Other changes:
 --------------
 
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index a0ebea96e..432781db3 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -702,8 +702,9 @@ not set the description attribute for those tags.</p>
   <tr>
     <td valign="top">description</td>
     <td valign="top">Description for tag (e.g. <code>To do:</code>)</td>
-    <td align="center" valign="top">No, the name will be used as a description
-      if this is not specified.</td>
+    <td align="center" valign="top">
+      No, the javadoc executable will pick a default if this is not specified.
+    </td>
   </tr>
   <tr>
     <td valign="top">enabled</td>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 6e2d61cf8..73c0078a2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1399,9 +1399,10 @@ public class Javadoc extends Task {
             if (getDescription() != null) {
                 return name + ":" + (enabled ? "" : "X")
                     + scope + ":" + getDescription();
+            } else if (!enabled || !"a".equals(scope)) {
+                return name + ":" + (enabled ? "" : "X") + scope;
             } else {
-                return name + ":" + (enabled ? "" : "X")
-                    + scope + ":" + name;
+                return name;
             }
         }
     }