Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 782D011802 for ; Wed, 6 Aug 2014 07:32:28 +0000 (UTC) Received: (qmail 38917 invoked by uid 500); 6 Aug 2014 07:32:28 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 38856 invoked by uid 500); 6 Aug 2014 07:32:28 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 38845 invoked by uid 99); 6 Aug 2014 07:32:28 -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 2014 07:32:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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 2014 07:32:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D7DC2389054; Wed, 6 Aug 2014 07:32:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1616114 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java Date: Wed, 06 Aug 2014 07:32:07 -0000 To: commits@sling.apache.org From: rombert@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140806073207.3D7DC2389054@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rombert Date: Wed Aug 6 07:32:06 2014 New Revision: 1616114 URL: http://svn.apache.org/r1616114 Log: SLING-3823 - ConnectorRegistryImpl uses java.net.URL.equals Use URL.toExternalForm() to compare string representations of the URLs. Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java?rev=1616114&r1=1616113&r2=1616114&view=diff ============================================================================== --- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java (original) +++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/topology/connector/ConnectorRegistryImpl.java Wed Aug 6 07:32:06 2014 @@ -85,7 +85,7 @@ public class ConnectorRegistryImpl imple for (Iterator> it = outgoingClientsMap .entrySet().iterator(); it.hasNext();) { Entry entry = it.next(); - if (entry.getValue().getConnectorUrl().equals(connectorUrl)) { + if (entry.getValue().getConnectorUrl().toExternalForm().equals(connectorUrl.toExternalForm())) { it.remove(); logger.info("registerOutgoingConnection: re-registering connector: "+connectorUrl); }