svn commit: r1531688 - /ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java

[jlboudart]

Author: jlboudart
Date: Sun Oct 13 14:16:51 2013
New Revision: 1531688

URL: http://svn.apache.org/r1531688
Log:
Fix potential NPE

Modified:
    
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java

Modified: 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: 
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1531688&r1=1531687&r2=1531688&view=diff
==============================================================================
--- 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
 (original)
+++ 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
 Sun Oct 13 14:16:51 2013
@@ -307,19 +307,19 @@ public class DefaultEasyAntXmlModuleDesc
                 }
                 pluginDescriptor.setMrid(mrid);
             } else {
+                String module = 
getSettings().substitute(attributes.getValue("module"));
                 String org = attributes.getValue("org") != null ? 
attributes.getValue("org") : attributes
                         .getValue("organisation");
                 org = getSettings().substitute(org);
                 if (org == null) {
                     if (pluginType == PluginType.BUILDTYPE) {
-                        Message.debug("No organisation specified for buildtype 
" + mrid + " using the default one");
+                        Message.debug("No organisation specified for buildtype 
" + module + " using the default one");
                         org = EasyAntConstants.EASYANT_BUILDTYPES_ORGANISATION;
                     } else {
-                        Message.debug("No organisation specified for plugin " 
+ mrid + " using the default one");
+                        Message.debug("No organisation specified for plugin " 
+ module + " using the default one");
                         org = EasyAntConstants.EASYANT_PLUGIN_ORGANISATION;
                     }
                 }
-                String module = 
getSettings().substitute(attributes.getValue("module"));
                 String revision = attributes.getValue("rev") != null ? 
attributes.getValue("rev") : attributes
                         .getValue("revision");
                 revision = getSettings().substitute(revision);