[Jboss-cvs] JBossAS SVN: r56299 - branches/Branch_4_0/server/src/main/org/jboss/deployment

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-08-26 15:58:38 -0400 (Sat, 26 Aug 2006)
New Revision: 56299

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java
Log:
Avoid NPE if moduleOrder not set

Modified: branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java	2006-08-26 13:00:18 UTC (rev 56298)
+++ branches/Branch_4_0/server/src/main/org/jboss/deployment/EARDeployer.java	2006-08-26 19:58:38 UTC (rev 56299)
@@ -272,12 +272,12 @@
          
          // Check for the Deployment Ordering style .
          String moduleOrder = metaData.getModuleOrder();
-         if(moduleOrder.equals("strict"))
+         if("strict".equalsIgnoreCase(moduleOrder))
         	 di.sortedSubDeployments=true;
          else
          {
         	 di.sortedSubDeployments=false;
-        	 if(!moduleOrder.equals("implicit"))
+        	 if(!"implicit".equalsIgnoreCase(moduleOrder))
         		 log.warn("Module Order should be set to strict or implicit , it is set to "+moduleOrder);
          }
       }