[jbossws-commits] JBossWS SVN: r5404 - in container/jboss40/tags/jbossws-jboss-4.0.5.SP2: src/main/java/org/jboss/wsf/container/jboss40 and 1 other directory.
Author: heiko.braun(a)jboss.com
Date: 2008-01-07 06:32:29 -0500 (Mon, 07 Jan 2008)
New Revision: 5404
Modified:
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/version.properties
Log:
Fix copy and paste error when SP1 was created
Modified:
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java
===================================================================
---
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java 2008-01-07
11:18:34 UTC (rev 5403)
+++
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java 2008-01-07
11:32:29 UTC (rev 5404)
@@ -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();
+ }
}
}
Modified: container/jboss40/tags/jbossws-jboss-4.0.5.SP2/version.properties
===================================================================
--- container/jboss40/tags/jbossws-jboss-4.0.5.SP2/version.properties 2008-01-07 11:18:34
UTC (rev 5403)
+++ container/jboss40/tags/jbossws-jboss-4.0.5.SP2/version.properties 2008-01-07 11:32:29
UTC (rev 5404)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=4.0.5.SP1
-repository.id=4.0.5.SP1
+version.id=4.0.5.SP2
+repository.id=4.0.5.SP2
implementation.title=JBoss Web Services - Integration JBoss40
implementation.url=http://www.jboss.org/products/jbossws