commit | b52b9252e9169f68267943c85355daa0fea7aa92 | [log] [tgz] |
---|---|---|
author | dgiormov <dgiormov> | Tue Apr 13 08:31:47 2010 +0000 |
committer | dgiormov <dgiormov> | Tue Apr 13 08:31:47 2010 +0000 |
tree | 9a8c8729d89c6bf5473b48d4441080f1f9cd31fe | |
parent | 00fc0126c4ff94ee4c76695e55b88d6da6c06b15 [diff] |
[284541] Session bean merger is enabled for session beans instead of EnterpriseBeanMerger, which was used till now.
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java index 7fae375..369b8e7 100644 --- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java +++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java
@@ -161,7 +161,7 @@ } private IMerger getSessionMerger(SessionBean baseBean, SessionBean toMergeType, int kind) { - return new EnterpriseBeanMerger(baseBean, toMergeType, kind); + return new SessionBeanMerger(baseBean, toMergeType, kind); } private void mergeMdbs(List warnings) throws Exception {