accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [12/13] git commit: ACCUMULO-2582 Get ride of the exceptions in the monitor log from trying to parse conf values we didn't want
Date Wed, 28 May 2014 00:40:52 GMT
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/ACCUMULO-378
Commit: b55f3b2a0ed306da87988d44471a346e17f2f41b
Parents: d63bb8a
Author: Josh Elser <elserj@apache.org>
Authored: Tue May 27 20:15:09 2014 -0400
Committer: Josh Elser <elserj@apache.org>
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<String,String> 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 {


Mime
View raw message