[jboss-cvs] JBossAS SVN: r96447 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-16 14:22:21 -0500 (Mon, 16 Nov 2009)
New Revision: 96447

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
Log:
- Load on startup should be a String as it is ok if it does not convert to an int.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java	2009-11-16 18:29:34 UTC (rev 96446)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java	2009-11-16 19:22:21 UTC (rev 96447)
@@ -48,7 +48,6 @@
 {
    private static final long serialVersionUID = 1;
    
-   private static final int loadOnStartupDefault = -1;
    private static final boolean asyncSupportedDefault = false;
    private static final boolean enabledDefault = true;
 
@@ -56,8 +55,7 @@
    private String jspFile;
    /** The servlet init-params */
    private List<ParamValueMetaData> initParam;
-   private int loadOnStartup = loadOnStartupDefault;
-   private boolean loadOnStartupSet = false;
+   private String loadOnStartup;
    private RunAsMetaData runAs;
    /** The security role ref */
    private SecurityRoleRefsMetaData securityRoleRefs;
@@ -101,14 +99,13 @@
    {
       this.jspFile = jspFile;
    }
-   public int getLoadOnStartup()
+   public String getLoadOnStartup()
    {
       return loadOnStartup;
    }
-   public void setLoadOnStartup(int loadOnStartup)
+   public void setLoadOnStartup(String loadOnStartup)
    {
       this.loadOnStartup = loadOnStartup;
-      loadOnStartupSet = true;
    }
    public RunAsMetaData getRunAs()
    {
@@ -176,9 +173,9 @@
          setInitParam(override.initParam);
       else if(original != null && original.initParam != null)
          setInitParam(original.initParam);
-      if(override != null && override.loadOnStartup != loadOnStartupDefault)
+      if(override != null && override.loadOnStartup != null)
          setLoadOnStartup(override.loadOnStartup);
-      else if(original != null && original.loadOnStartup != loadOnStartupDefault)
+      else if(original != null && original.loadOnStartup != null)
          setLoadOnStartup(original.loadOnStartup);
       if(override != null && override.runAs != null)
          setRunAs(override.runAs);
@@ -277,20 +274,16 @@
          setInitParam(mergedInitParams);
       }
       // Load on startup
-      if (!loadOnStartupSet)
+      if (getLoadOnStartup() == null)
       {
-         if (webFragmentMetaData.loadOnStartupSet)
-         {
-            setLoadOnStartup(webFragmentMetaData.getLoadOnStartup());
-         }
+         setLoadOnStartup(webFragmentMetaData.getLoadOnStartup());
       }
-      else
+      else if (webFragmentMetaData.getLoadOnStartup() != null)
       {
-         if (!resolveConflicts && webFragmentMetaData.loadOnStartupSet 
-               && (getLoadOnStartup() != webFragmentMetaData.getLoadOnStartup())
-               && (webMetaData == null || !webMetaData.loadOnStartupSet))
+         if (!resolveConflicts && !getLoadOnStartup().equals(webFragmentMetaData.getLoadOnStartup()) 
+               && (webMetaData == null || webMetaData.getLoadOnStartup() == null))
          {
-            throw new IllegalStateException("Unresolved conflict on load on startup");
+            throw new IllegalStateException("Unresolved conflict on load on startup: " + getLoadOnStartup());
          }
       }
       // Run as