Index: src/main/java/com/sun/enterprise/deployment/WebFragmentDescriptor.java =================================================================== --- src/main/java/com/sun/enterprise/deployment/WebFragmentDescriptor.java (revision 36912) +++ src/main/java/com/sun/enterprise/deployment/WebFragmentDescriptor.java (working copy) @@ -206,7 +206,7 @@ @Override protected void combineJmsDestinationReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { - for (JmsDestinationReferenceDescriptor jdRef: getJmsDestinationReferenceDescriptors()) { + for (JmsDestinationReferenceDescriptor jdRef: webBundleDescriptor.getJmsDestinationReferenceDescriptors()) { JmsDestinationReferenceDescriptor jdr = _getJmsDestinationReferenceByName(jdRef.getName()); if (jdr != null) { webBundleDescriptor.conflictJmsDestinationReference = true; @@ -220,7 +220,7 @@ @Override protected void combineMessageDestinationReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (MessageDestinationReferenceDescriptor mdRef : - getMessageDestinationReferenceDescriptors()) { + webBundleDescriptor.getMessageDestinationReferenceDescriptors()) { MessageDestinationReferenceDescriptor mdr = _getMessageDestinationReferenceByName(mdRef.getName()); if (mdr != null) { @@ -235,7 +235,7 @@ @Override protected void combineEntityManagerReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (EntityManagerReferenceDescriptor emRef : - getEntityManagerReferenceDescriptors()) { + webBundleDescriptor.getEntityManagerReferenceDescriptors()) { EntityManagerReferenceDescriptor emr = _getEntityManagerReferenceByName(emRef.getName()); if (emr != null) { @@ -250,7 +250,7 @@ @Override protected void combineEntityManagerFactoryReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (EntityManagerFactoryReferenceDescriptor emfRef : - getEntityManagerFactoryReferenceDescriptors()) { + webBundleDescriptor.getEntityManagerFactoryReferenceDescriptors()) { EntityManagerFactoryReferenceDescriptor emfr = _getEntityManagerFactoryReferenceByName(emfRef.getName()); if (emfr != null) { Index: src/main/java/com/sun/enterprise/deployment/WebBundleDescriptor.java =================================================================== --- src/main/java/com/sun/enterprise/deployment/WebBundleDescriptor.java (revision 36912) +++ src/main/java/com/sun/enterprise/deployment/WebBundleDescriptor.java (working copy) @@ -547,7 +547,7 @@ } protected void combineJmsDestinationReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { - for (JmsDestinationReferenceDescriptor jdRef: getJmsDestinationReferenceDescriptors()) { + for (JmsDestinationReferenceDescriptor jdRef: webBundleDescriptor.getJmsDestinationReferenceDescriptors()) { JmsDestinationReferenceDescriptor jdr = _getJmsDestinationReferenceByName(jdRef.getName()); if (jdr != null) { combineInjectionTargets(jdr, jdRef); @@ -947,7 +947,7 @@ protected void combineEntityManagerFactoryReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (EntityManagerFactoryReferenceDescriptor emfRef : - getEntityManagerFactoryReferenceDescriptors()) { + webBundleDescriptor.getEntityManagerFactoryReferenceDescriptors()) { EntityManagerFactoryReferenceDescriptor emfr = _getEntityManagerFactoryReferenceByName(emfRef.getName()); if (emfr != null) { @@ -1009,7 +1009,7 @@ protected void combineEntityManagerReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (EntityManagerReferenceDescriptor emRef : - getEntityManagerReferenceDescriptors()) { + webBundleDescriptor.getEntityManagerReferenceDescriptors()) { EntityManagerReferenceDescriptor emr = _getEntityManagerReferenceByName(emRef.getName()); if (emr != null) { @@ -1185,7 +1185,7 @@ protected void combineMessageDestinationReferenceDescriptors(WebBundleDescriptor webBundleDescriptor) { for (MessageDestinationReferenceDescriptor mdRef : - getMessageDestinationReferenceDescriptors()) { + webBundleDescriptor.getMessageDestinationReferenceDescriptors()) { MessageDestinationReferenceDescriptor mdr = _getMessageDestinationReferenceByName(mdRef.getName()); if (mdr != null) {