Revert last 5 commits

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index f20baabab..e68ddf05c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -157,10 +157,12 @@ public class DescriptorHandler extends HandlerBase {
             return;
         }
 
-        if (getClass().getResource(location) != null && publicId != null) {
-            resourceDTDs.put(publicId, location);
-            owningTask.log("Mapped publicId " + publicId + " to resource "
+        if (getClass().getResource(location) != null) {
+            if (publicId != null) {
+                resourceDTDs.put(publicId, location);
+                owningTask.log("Mapped publicId " + publicId + " to resource "
                     + location, Project.MSG_VERBOSE);
+            }
         }
 
         try {
@@ -381,8 +383,10 @@ public class DescriptorHandler extends HandlerBase {
         }
 
         // Get the value of the <ejb-name> tag.  Only the first occurrence.
-        if (currentElement.equals(EJB_NAME) && ejbName == null) {
-            ejbName = currentText.trim();
+        if (currentElement.equals(EJB_NAME)) {
+            if (ejbName == null) {
+                ejbName = currentText.trim();
+            }
         }
     }
 }