Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-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 6A95F10A43 for ; Tue, 11 Mar 2014 16:34:32 +0000 (UTC) Received: (qmail 48342 invoked by uid 500); 11 Mar 2014 16:34:20 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 48128 invoked by uid 500); 11 Mar 2014 16:34:15 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 48018 invoked by uid 99); 11 Mar 2014 16:34:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 16:34:11 +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; Tue, 11 Mar 2014 16:34:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F07EA2388A33; Tue, 11 Mar 2014 16:33:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1576413 - /qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java Date: Tue, 11 Mar 2014 16:33:46 -0000 To: commits@qpid.apache.org From: astitcher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140311163346.F07EA2388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: astitcher Date: Tue Mar 11 16:33:46 2014 New Revision: 1576413 URL: http://svn.apache.org/r1576413 Log: PROTON-506: Fix Java address URL parser to correctly identify the host component if there is an '@' character in the path component. Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java?rev=1576413&r1=1576412&r2=1576413&view=diff ============================================================================== --- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java (original) +++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/messenger/impl/Address.java Tue Mar 11 16:33:46 2014 @@ -56,35 +56,39 @@ class Address int start = 0; int schemeEnd = _address.indexOf("://", start); - if (schemeEnd > 0) { + if (schemeEnd >= 0) { _scheme = _address.substring(start, schemeEnd); start = schemeEnd + 3; } - int at = _address.indexOf('@', start); - if (at > 0) { - String up = _address.substring(start, at); + String uphp; + int slash = _address.indexOf("/", start); + if (slash > 0) { + uphp = _address.substring(start, slash); + _name = _address.substring(slash + 1); + } else { + uphp = _address.substring(start); + } + + String hp; + int at = uphp.indexOf('@'); + if (at >= 0) { + String up = uphp.substring(0, at); + hp = uphp.substring(at + 1); + int colon = up.indexOf(':'); - if (colon > 0) { + if (colon >= 0) { _user = up.substring(0, colon); _pass = up.substring(colon + 1); } else { _user = up; } - start = at + 1; - } - - int slash = _address.indexOf("/", start); - String hp; - if (slash > 0) { - hp = _address.substring(start, slash); - _name = _address.substring(slash + 1); } else { - hp = _address.substring(start); + hp = uphp; } int colon = hp.indexOf(':'); - if (colon > 0) { + if (colon >= 0) { _host = hp.substring(0, colon); _port = hp.substring(colon + 1); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org