Merge branch '1.9.x'

src/main/org/apache/tools/ant/IntrospectionHelper.java

@@ -407,13 +407,15 @@ public final class IntrospectionHelper {
                     + " doesn't support the \"" + attributeName + "\" attribute.";
             throw new UnsupportedAttributeException(msg, attributeName);
         }
-        try {
-            as.setObject(p, element, value);
-        } catch (final IllegalAccessException ie) {
-            // impossible as getMethods should only return public methods
-            throw new BuildException(ie);
-        } catch (final InvocationTargetException ite) {
-            throw extractBuildException(ite);
+        if (as != null) { // possible if value == null
+            try {
+                as.setObject(p, element, value);
+            } catch (final IllegalAccessException ie) {
+                // impossible as getMethods should only return public methods
+                throw new BuildException(ie);
+            } catch (final InvocationTargetException ite) {
+                throw extractBuildException(ite);
+            }
         }
     }
 

src/main/org/apache/tools/ant/UnknownElement.java

@@ -646,7 +646,8 @@ public class UnknownElement extends Task {
             return false;
         }
         for (int i = 0; i < childrenSize; ++i) {
-            UnknownElement child = (UnknownElement) children.get(i);
+            // children cannot be null childrenSize would have been 0
+            UnknownElement child = (UnknownElement) children.get(i); //NOSONAR
             if (!child.similar(other.children.get(i))) {
                 return false;
             }

src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -1772,10 +1772,12 @@ public class Javadoc extends Task {
                 useExternalFile, tmpList, srcListWriter);
 
             if (useExternalFile) {
-                srcListWriter.flush();
+                srcListWriter.flush(); //NOSONAR
             }
         } catch (final IOException e) {
-            tmpList.delete();
+            if (tmpList != null) {
+                tmpList.delete();
+            }
             throw new BuildException("Error creating temporary file",
                                      e, getLocation());
         } finally {

src/main/org/apache/tools/ant/taskdefs/MacroInstance.java

@@ -197,9 +197,12 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
                     }
                     break;
                 case STATE_EXPECT_NAME:
+                    // macroName cannot be null as this state is only
+                    // ever reached from STATE_EXPECT_BRACKET after it
+                    // has been set
                     if (ch == '}') {
                         state = STATE_NORMAL;
-                        String name = macroName.toString().toLowerCase(Locale.ENGLISH);
+                        String name = macroName.toString().toLowerCase(Locale.ENGLISH); //NOSONAR
                         String value = (String) macroMapping.get(name);
                         if (value == null) {
                             ret.append("@{");
@@ -210,7 +213,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
                         }
                         macroName = null;
                     } else {
-                        macroName.append(ch);
+                        macroName.append(ch); //NOSONAR
                     }
                     break;
                 default:
@@ -224,8 +227,11 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
                 ret.append('@');
                 break;
             case STATE_EXPECT_NAME:
+                // macroName cannot be null as this state is only
+                // ever reached from STATE_EXPECT_BRACKET after it
+                // has been set
                 ret.append("@{");
-                ret.append(macroName.toString());
+                ret.append(macroName.toString()); //NOSONAR
                 break;
             default:
                 break;

src/main/org/apache/tools/ant/taskdefs/XmlProperty.java

@@ -384,10 +384,12 @@ public class XmlProperty extends org.apache.tools.ant.Task {
                     if (containingPath != null && nodeName.equals(PATH)) {
                         // A "path" attribute for a node within a Path object.
                         containingPath.setPath(attributeValue);
-                    } else if (container instanceof Path && nodeName.equals(REF_ID)) {
+                    } else if (containingPath != null
+                               && container instanceof Path && nodeName.equals(REF_ID)) {
                         // A "refid" attribute for a node within a Path object.
                         containingPath.setPath(attributeValue);
-                    } else if (container instanceof Path && nodeName.equals(LOCATION)) {
+                    } else if (containingPath != null && container instanceof Path
+                               && nodeName.equals(LOCATION)) {
                         // A "location" attribute for a node within a
                         // Path object.
                         containingPath.setLocation(resolveFile(attributeValue));

src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java

@@ -197,7 +197,7 @@ public class Depend extends MatchingTask {
                     dependencyList = new Vector();
                     className = line.substring(prependLength);
                     dependencyMap.put(className, dependencyList);
-                } else {
+                } else if (dependencyList != null) {
                     dependencyList.addElement(line);
                 }
             }

src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -553,7 +553,7 @@ public class JDependTask extends Task {
             }
 
             jdepend.analyze();
-            if (pw.checkError()) {
+            if (pw != null && pw.checkError()) {
                 throw new IOException("Encountered an error writing JDepend"
                                       + " output");
             }

src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java

@@ -133,7 +133,9 @@ public class AntSoundPlayer implements LineListener, BuildListener {
                 } else {
                     playClip(audioClip, loops);
                 }
-                audioClip.drain();
+                if (audioClip != null) {
+                    audioClip.drain();
+                }
             } finally {
                 FileUtils.close(audioClip);
             }

src/main/org/apache/tools/tar/TarEntry.java

@@ -333,7 +333,7 @@ public class TarEntry implements TarConstants {
      * @return True if the entries are equal.
      */
     public boolean equals(TarEntry it) {
-        return getName().equals(it.getName());
+        return it != null && getName().equals(it.getName());
     }
 
     /**

src/main/org/apache/tools/zip/ZipFile.java

@@ -1038,12 +1038,12 @@ public class ZipFile implements Closeable {
         @Override
         public boolean equals(final Object other) {
             if (super.equals(other)) {
-                // super.equals would return false if other were not an Entry
+                // super.equals would return false if other were null or not an Entry
                 final Entry otherEntry = (Entry) other;
                 return offsetEntry.headerOffset
-                        == otherEntry.offsetEntry.headerOffset
+                        == otherEntry.offsetEntry.headerOffset //NOSONAR
                     && offsetEntry.dataOffset
-                        == otherEntry.offsetEntry.dataOffset;
+                        == otherEntry.offsetEntry.dataOffset; //NOSONAR
             }
             return false;
         }