Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 49813 invoked from network); 6 Aug 2008 12:43:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Aug 2008 12:43:24 -0000 Received: (qmail 30760 invoked by uid 500); 6 Aug 2008 12:43:23 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 30618 invoked by uid 500); 6 Aug 2008 12:43:23 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 30609 invoked by uid 500); 6 Aug 2008 12:43:23 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 30605 invoked by uid 99); 6 Aug 2008 12:43:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2008 05:43:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2008 12:42:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C6432388986; Wed, 6 Aug 2008 05:43:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r683250 - /webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Date: Wed, 06 Aug 2008 12:43:02 -0000 To: axis2-cvs@ws.apache.org From: nandana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080806124303.2C6432388986@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nandana Date: Wed Aug 6 05:43:01 2008 New Revision: 683250 URL: http://svn.apache.org/viewvc?rev=683250&view=rev Log: AXIS2-3958 Applying Han's patch Modified: webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Modified: webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=683250&r1=683249&r2=683250&view=diff ============================================================================== --- webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ webservices/axis2/branches/java/1_4/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Wed Aug 6 05:43:01 2008 @@ -95,7 +95,7 @@ private URL axis2Repository = null; private Map allServices = new Hashtable(); - private HashMap allEndpoints = new HashMap(); + private Map allEndpoints = new Hashtable(); /** * Stores the module specified in the server.xml at the document parsing time. @@ -389,17 +389,11 @@ } //removes the endpoints to this service + String serviceName = axisService.getName(); String key = null; - List endPointsForThisService = new ArrayList(); - for (Iterator iter = this.allEndpoints.keySet().iterator(); iter.hasNext();){ - key = (String)iter.next(); - if (key.startsWith(axisService.getName())){ - endPointsForThisService.add(key); - } - } - - for (Iterator iter = endPointsForThisService.iterator();iter.hasNext();){ - this.allEndpoints.remove(iter.next()); + for (Iterator iter = axisService.getEndpoints().keySet().iterator(); iter.hasNext();){ + key = serviceName + "." + (String)iter.next(); + this.allEndpoints.remove(key); } }