[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

[ctubbsii]

Merge branch '1.6.0-SNAPSHOT'

Conflicts:
        
server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7492d747
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7492d747
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7492d747

Branch: refs/heads/master
Commit: 7492d747850ca2211548898436ef8536321915ab
Parents: 9ef0fca 9621701
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Apr 23 16:59:54 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Apr 23 16:59:54 2014 -0400

----------------------------------------------------------------------
 pom.xml                                         |  2 +-
 .../accumulo/monitor/servlets/BasicServlet.java | 26 +++++++--
 .../monitor/servlets/OperationServlet.java      | 52 +++++++++--------
 .../org/apache/accumulo/monitor/util/Table.java | 59 ++++++++++----------
 4 files changed, 78 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7492d747/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7492d747/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --cc 
server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 7d1069b,603f55f..86a84b9
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@@ -20,8 -20,8 +20,9 @@@ import java.io.IOException
  import java.io.PrintWriter;
  import java.io.StringWriter;
  import java.io.UnsupportedEncodingException;
+ import java.net.URLDecoder;
  import java.net.URLEncoder;
 +import java.nio.charset.StandardCharsets;
  import java.util.Date;
  import java.util.List;
  import java.util.TimerTask;
@@@ -244,10 -248,19 +249,19 @@@ abstract public class BasicServlet exte
  
    public static String encode(String s) {
      try {
 -      return URLEncoder.encode(s, Constants.UTF8.name());
 +      return URLEncoder.encode(s, StandardCharsets.UTF_8.name());
      } catch (UnsupportedEncodingException e) {
 -      Logger.getLogger(BasicServlet.class).fatal(Constants.UTF8.name() + " is 
not a recognized encoding", e);
 +      
Logger.getLogger(BasicServlet.class).fatal(StandardCharsets.UTF_8.name() + " is 
not a recognized encoding", e);
-       throw new RuntimeException(e);
+       throw new AssertionError(e); // can't happen with UTF-8
+     }
+   }
+ 
+   public static String decode(String s) {
+     try {
 -      return URLDecoder.decode(s, Constants.UTF8.name());
++      return URLDecoder.decode(s, StandardCharsets.UTF_8.name());
+     } catch (UnsupportedEncodingException e) {
 -      Logger.getLogger(BasicServlet.class).fatal(Constants.UTF8.name() + " is 
not a recognized encoding", e);
++      
Logger.getLogger(BasicServlet.class).fatal(StandardCharsets.UTF_8.name() + " is 
not a recognized encoding", e);
+       throw new AssertionError(e); // can't happen with UTF-8
      }
    }