Author: Grid.Qian Date: 2010-07-22 00:28:44 -0400 (Thu, 22 Jul 2010) New Revision: 23651 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java Log: JBIDE-6683: commit to trunk for M2 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2010-07-22 00:18:32 UTC (rev 23650) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2010-07-22 04:28:44 UTC (rev 23651) @@ -133,7 +133,7 @@ for (int i = 0; i < theServletMapplings.size(); i++) { org.eclipse.jst.j2ee.webapplication.ServletMapping aServletMapping = (org.eclipse.jst.j2ee.webapplication.ServletMapping) theServletMapplings .get(i); - if (aServletMapping.getName().equals(servletDescriptor.getName()) + if (aServletMapping.getServlet().getServletName().equals(servletDescriptor.getName()) || aServletMapping.getUrlPattern().equals( servletDescriptor.getMappings())) { status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same);