Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-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 5E96810A88 for ; Tue, 1 Sep 2015 00:02:18 +0000 (UTC) Received: (qmail 52487 invoked by uid 500); 1 Sep 2015 00:02:18 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 52449 invoked by uid 500); 1 Sep 2015 00:02:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 52440 invoked by uid 99); 1 Sep 2015 00:02:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2015 00:02:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0147CDFBD3; Tue, 1 Sep 2015 00:02:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 01 Sep 2015 00:02:18 -0000 Message-Id: In-Reply-To: <75cb381aa5e34067933690cd3da45a52@git.apache.org> References: <75cb381aa5e34067933690cd3da45a52@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: simply a supressWarnings annotation simply a supressWarnings annotation Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d31b0ea3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d31b0ea3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d31b0ea3 Branch: refs/heads/master Commit: d31b0ea35256dbf89038557aaf9b15ead75bc8e7 Parents: 0f87505 Author: Clebert Suconic Authored: Mon Aug 31 20:02:10 2015 -0400 Committer: Clebert Suconic Committed: Mon Aug 31 20:02:10 2015 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d31b0ea3/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java index ab8d10f..cb7a4bd 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/TCPServerLocatorSchema.java @@ -76,10 +76,13 @@ public class TCPServerLocatorSchema extends AbstractServerLocatorSchema { return new URI(SchemaConstants.TCP, null, getHost(params), getPort(params), null, createQuery(params, query), fragment.toString()); } + @SuppressWarnings("StringEquality") private static Map escapeIPv6Host(Map params) { String host = (String) params.get("host"); String newHost = IPV6Util.encloseHost(host); + // We really want to check the objects here + // Some bug finders may report this as an error, hence the SupressWarnings on this method if (host != newHost) { params.put("host", "[" + host + "]"); }