addendum

Author: virajjasani

hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java

@@ -184,9 +184,9 @@ public KeyVersion run() throws Exception {
         keyVersion = removeKeyMaterial(keyVersion);
       }
       Map json = KMSUtil.toJSON(keyVersion);
-      String requestURL = KMSMDCFilter.getURL();
-      int idx = requestURL.lastIndexOf(KMSRESTConstants.KEYS_RESOURCE);
-      requestURL = requestURL.substring(0, idx);
+      //String requestURL = KMSMDCFilter.getURL();
+      //int idx = requestURL.lastIndexOf(KMSRESTConstants.KEYS_RESOURCE);
+      //requestURL = requestURL.substring(0, idx);
       LOG.trace("Exiting createKey Method.");
       // additional head with header("Location", getKeyURI(requestURL, name))
       // no longer supported by jersey 2

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java

@@ -109,7 +109,7 @@ public Response toResponse(Exception e) {
       s = Response.Status.BAD_REQUEST;
     } else if (e instanceof IllegalArgumentException) {
       s = Response.Status.BAD_REQUEST;
-    } else if (e != null && e.getCause() != null) {
+    } else if (e.getCause() != null) {
       if (e.getCause() instanceof SecurityException) {
         s = Response.Status.FORBIDDEN;
         e = (Exception) e.getCause();