From 712a7f7c1b13217b58ecb8caad3be944e828531c Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Thu, 14 Sep 2006 17:15:54 +0000 Subject: [PATCH] ignore passed-in Stack in factory method if null git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@443418 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/util/IdentityStack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/util/IdentityStack.java b/src/main/org/apache/tools/ant/util/IdentityStack.java index 11626a296..a9f83a54e 100755 --- a/src/main/org/apache/tools/ant/util/IdentityStack.java +++ b/src/main/org/apache/tools/ant/util/IdentityStack.java @@ -27,7 +27,7 @@ public class IdentityStack extends Stack { /** * Get an IdentityStack containing the contents of the specified Stack. - * @param s the Stack to copy. + * @param s the Stack to copy; ignored if null. * @return an IdentityStack instance. */ public static IdentityStack getInstance(Stack s) { @@ -35,7 +35,9 @@ public class IdentityStack extends Stack { return (IdentityStack) s; } IdentityStack result = new IdentityStack(); - result.addAll(s); + if (s != null) { + result.addAll(s); + } return result; }