You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ma...@apache.org on 2008/12/09 07:48:55 UTC
svn commit: r724621 -
/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Author: manugeorge
Date: Mon Dec 8 22:48:55 2008
New Revision: 724621
URL: http://svn.apache.org/viewvc?rev=724621&view=rev
Log:
GERONIMO-4452 Fixing a wrong patch merge for GERONIMO-4178
Modified:
geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=724621&r1=724620&r2=724621&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Dec 8 22:48:55 2008
@@ -873,12 +873,14 @@
// add a dependency from the module to the ra so we can be assured the mdb
// container exists when this app is started
ejbModuleGBeanData.addDependency(resourceAdapterAbstractName);
- for(MessageDrivenBeanInfo mdbInfo:mdbs.values()){
- if(mdbInfo != null && mdbInfo.containerId == null){
- throw new DeploymentException("No Resource Adapter defined for MDB '" + mdbInfo.ejbName + "'");
- }
+ }
+ //check that all the mdbs have resource adapters identified.
+ for(MessageDrivenBeanInfo mdbInfo:mdbs.values()){
+ if(mdbInfo != null && mdbInfo.containerId == null){
+ throw new DeploymentException("No Resource Adapter defined for MDB '" + mdbInfo.ejbName + "'");
}
}
+
}
private String getResourceAdapterId(AbstractName resourceAdapterAbstractName) {