ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r409022 - /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
Date Tue, 23 May 2006 23:01:51 GMT
Author: mbenson
Date: Tue May 23 16:01:50 2006
New Revision: 409022

URL: http://svn.apache.org/viewvc?rev=409022&view=rev
Log:
guard against NPE, bugzilla 39648

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java?rev=409022&r1=409021&r2=409022&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java Tue May 23
16:01:50 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -207,7 +207,7 @@
         if (isReference()) {
             return getCheckedRef().toString();
         }
-        if (coll.size() == 0) {
+        if (coll == null || coll.isEmpty()) {
             return "";
         }
         StringBuffer sb = new StringBuffer();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message