[jboss-cvs] JBossAS SVN: r95473 - projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-23 05:58:58 -0400 (Fri, 23 Oct 2009)
New Revision: 95473

Modified:
   projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
Log:
Skip parsing if metadata is available already

Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java	2009-10-23 09:56:57 UTC (rev 95472)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java	2009-10-23 09:58:58 UTC (rev 95473)
@@ -96,7 +96,8 @@
 
    public void invoke(int state, Deployment dep) throws LifecycleInterceptorException
    {
-      if (state == Bundle.STARTING)
+      WebApp webApp = dep.getAttachment(WebApp.class);
+      if (webApp == null && state == Bundle.STARTING)
       {
          try
          {
@@ -104,7 +105,7 @@
             if (webXML != null)
             {
                log.debug("Create and attach WebApp metadata");
-               WebApp webApp = createWebAppMetadata(dep, webXML);
+               webApp = createWebAppMetadata(dep, webXML);
                dep.addAttachment(WebApp.class, webApp);
             }
          }