Author: heiko.braun(a)jboss.com Date: 2007-08-10 12:24:47 -0400 (Fri, 10 Aug 2007) New Revision: 4321 Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java Log: Fix JBWS-1747:WebMetaDataAdapter doesn't check if there's a J2eeApplicationMetaData instance set on the DeploymentInfo parent Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java =================================================================== --- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2007-08-10 16:10:38 UTC (rev 4320) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2007-08-10 16:24:47 UTC (rev 4321) @@ -60,12 +60,15 @@ if (di.parent != null) { J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData; - Iterator it = appmd.getModules(); - while (it.hasNext()) + if(appmd!=null) // An ESB case, They deploy a *.war inside *.esb { - J2eeModuleMetaData module = (J2eeModuleMetaData)it.next(); - if (module.getFileName().equals(dep.getSimpleName())) - contextRoot = module.getWebContext(); + Iterator it = appmd.getModules(); + while (it.hasNext()) + { + J2eeModuleMetaData module = (J2eeModuleMetaData)it.next(); + if (module.getFileName().equals(dep.getSimpleName())) + contextRoot = module.getWebContext(); + } } }