Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 1A37711186 for ; Sat, 14 Jun 2014 04:55:05 +0000 (UTC) Received: (qmail 49737 invoked by uid 500); 14 Jun 2014 04:55:05 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 49621 invoked by uid 500); 14 Jun 2014 04:55:04 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 49543 invoked by uid 99); 14 Jun 2014 04:55:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jun 2014 04:55:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BFF23934900; Sat, 14 Jun 2014 04:55:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 14 Jun 2014 04:55:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/51] [abbrv] git commit: ACCUMULO-2582 Get ride of the exceptions in the monitor log from trying to parse conf values we didn't want ACCUMULO-2582 Get ride of the exceptions in the monitor log from trying to parse conf values we didn't want Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b55f3b2a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b55f3b2a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b55f3b2a Branch: refs/heads/master Commit: b55f3b2a0ed306da87988d44471a346e17f2f41b Parents: d63bb8a Author: Josh Elser Authored: Tue May 27 20:15:09 2014 -0400 Committer: Josh Elser Committed: Tue May 27 20:15:09 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/monitor/servlets/ReplicationServlet.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b55f3b2a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java index 7861ba0..5e7f255 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ReplicationServlet.java @@ -105,7 +105,9 @@ public class ReplicationServlet extends BasicServlet { // Get the defined peers and what ReplicaSystem impl they're using for (Entry property : properties.entrySet()) { - if (property.getKey().startsWith(definedPeersPrefix)) { + String key = property.getKey(); + // Filter out cruft that we don't want + if (key.startsWith(definedPeersPrefix) && !key.startsWith(Property.REPLICATION_PEER_USER.getKey()) && !key.startsWith(Property.REPLICATION_PEER_PASSWORD.getKey())) { String peerName = property.getKey().substring(definedPeersPrefix.length()); ReplicaSystem replica; try {