commit b70a7f0ee25d3fcf5da93330288fd9ce10104025
author dgiormov <dgiormov> Wed Apr 14 06:05:50 2010 +0000
committer dgiormov <dgiormov> Wed Apr 14 06:05:50 2010 +0000
tree 9a8c8729d89c6bf5473b48d4441080f1f9cd31fe
parent 46e5b6c828cb732a726caca3538a50eff640bf15

[284541] Session bean merger is enabled for session beans instead of EnterpriseBeanMerger, which was used till now.

plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/mergers/EjbJarMerger.java

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 {