svn commit: r1554398 - in /ant/core/trunk/src/main/org/apache/tools/ant/types: Resource.java resources/ArchiveResource.java resources/FileResource.java resources/URLResource.java

[bodewig]

Author: bodewig
Date: Tue Dec 31 10:52:21 2013
New Revision: 1554398

URL: http://svn.apache.org/r1554398
Log:
equals implementations are not null-safe

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java
    
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
    
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
    
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/URLResource.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java?rev=1554398&r1=1554397&r2=1554398&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Resource.java Tue Dec 31 
10:52:21 2013
@@ -287,7 +287,8 @@ public class Resource extends DataType i
         if (isReference()) {
             return getCheckedRef().equals(other);
         }
-        return other.getClass().equals(getClass()) && compareTo((Resource) 
other) == 0;
+        return other != null && other.getClass().equals(getClass())
+            && compareTo((Resource) other) == 0;
     }
 
     /**

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java?rev=1554398&r1=1554397&r2=1554398&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
 (original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
 Tue Dec 31 10:52:21 2013
@@ -216,7 +216,7 @@ public abstract class ArchiveResource ex
         if (isReference()) {
             return getCheckedRef().equals(another);
         }
-        if (!(another.getClass().equals(getClass()))) {
+        if (another == null || !(another.getClass().equals(getClass()))) {
             return false;
         }
         ArchiveResource r = (ArchiveResource) another;

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java?rev=1554398&r1=1554397&r2=1554398&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java 
(original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java 
Tue Dec 31 10:52:21 2013
@@ -299,7 +299,7 @@ public class FileResource extends Resour
         if (isReference()) {
             return getCheckedRef().equals(another);
         }
-        if (!(another.getClass().equals(getClass()))) {
+        if (another == null || !(another.getClass().equals(getClass()))) {
             return false;
         }
         FileResource otherfr = (FileResource) another;

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/URLResource.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/URLResource.java?rev=1554398&r1=1554397&r2=1554398&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/URLResource.java 
(original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/URLResource.java 
Tue Dec 31 10:52:21 2013
@@ -298,7 +298,7 @@ public class URLResource extends Resourc
         if (isReference()) {
             return getCheckedRef().equals(another);
         }
-        if (!(another.getClass().equals(getClass()))) {
+        if (another == null || !(another.getClass().equals(getClass()))) {
             return false;
         }
         URLResource otheru = (URLResource) another;