[Yanel-commits] rev 49096 - public/yanel/trunk/src/build/java/org/wyona/yanel/ant

[guillaume at wyona.com]

Author: guillaume
Date: 2010-04-28 12:34:22 +0200 (Wed, 28 Apr 2010)
New Revision: 49096

Modified:
   public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java
Log:
Allow multiple "package" resource-types again (it was broken since r42497).

Issue: 7531


Modified: public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java
===================================================================
--- public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java	2010-04-28 08:29:05 UTC (rev 49095)
+++ public/yanel/trunk/src/build/java/org/wyona/yanel/ant/MergeResourceTypesConfigsTask.java	2010-04-28 10:34:22 UTC (rev 49096)
@@ -123,7 +123,7 @@
                     }
 
                     // TODO: Check for duplicated resource-types also based re package attribute!
-                    if (!resourceTypeExists(srcAttr, rootElement)) {
+                    if (srcAttr == null || srcAttr.equals("") || !resourceTypeExists(srcAttr, rootElement)) {
                         rootElement.appendChild(globalDoc.createTextNode("\n  ")); // Only formatting
                         Element rtElement = globalDoc.createElementNS(NAMESPACE, "resource-type");
                         //Element rtElement = globalDoc.createElementNS(namespace, "todo");