tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1511833 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Date Thu, 08 Aug 2013 15:31:32 GMT
Author: rmannibucau
Date: Thu Aug  8 15:31:31 2013
New Revision: 1511833

URL: http://svn.apache.org/r1511833
Log:
TOMEE-1017 web fragments should consider adding an entry if not already here only - resources
were not merged

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1511833&r1=1511832&r2=1511833&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Thu Aug  8 15:31:31 2013
@@ -573,6 +573,8 @@ public class ReadDescriptors implements 
                         mergeOnlyMissingEntries(webModule.getWebApp().getEjbRefMap(), webFragment.getEjbRef());
                         mergeOnlyMissingEntries(webModule.getWebApp().getServiceRefMap(),
webFragment.getServiceRef());
                         mergeOnlyMissingEntries(webModule.getWebApp().getEnvEntryMap(), webFragment.getEnvEntry());
+                        mergeOnlyMissingEntries(webModule.getWebApp().getResourceEnvRefMap(),
webFragment.getResourceEnvRef());
+                        mergeOnlyMissingEntries(webModule.getWebApp().getResourceRefMap(),
webFragment.getResourceRef());
                     } catch (final Exception e) {
                         logger.warning("can't read " + url.toString(), e);
                     }



Mime
View raw message