From 8b432916d58da1e110988661c8febfde91d523a7 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Tue, 9 Aug 2005 14:55:07 +0000 Subject: [PATCH] Fix reversed ?: consequences; avoid NPE. PR: 36094 Obtained from: Dave Brosius git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278509 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/Resource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/types/Resource.java b/src/main/org/apache/tools/ant/types/Resource.java index 345d53055..eccbdc22c 100644 --- a/src/main/org/apache/tools/ant/types/Resource.java +++ b/src/main/org/apache/tools/ant/types/Resource.java @@ -294,7 +294,7 @@ public class Resource extends DataType return getCheckedRef().hashCode(); } String name = getName(); - return MAGIC * (name == null ? name.hashCode() : NULL_NAME); + return MAGIC * (name == null ? NULL_NAME : name.hashCode()); } /**