Repository: incubator-ranger Updated Branches: refs/heads/master 0cff775ce -> 214f51eff
RANGER-259: fixed to confirm to good coding practice Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/214f51ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/214f51ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/214f51ef Branch: refs/heads/master Commit: 214f51eff9c13e6eafa4ddcbdb2bbf3b8f141882 Parents: 0cff775 Author: sneethiraj <[email protected]> Authored: Thu Apr 23 22:35:26 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Thu Apr 23 22:35:26 2015 -0400 ---------------------------------------------------------------------- .../apache/hadoop/crypto/key/JKS2RangerUtil.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/214f51ef/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java index 4e9ea59..65d3db2 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/JKS2RangerUtil.java @@ -23,6 +23,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; +import java.nio.charset.Charset; import java.security.KeyStore; import java.security.KeyStoreException; @@ -98,16 +99,13 @@ public class JKS2RangerUtil { try { in.close(); } catch (Exception e) { - System.err.println("ERROR: Unable to close file stream for [" + keyStoreFileName + "]") ; - System.exit(1); + throw new RuntimeException("ERROR: Unable to close file stream for [" + keyStoreFileName + "]", e) ; } } } } catch(Throwable t) { - System.err.println("Unable to import keys from [" + keyStoreFileName + "] due to exception :" + t ) ; - t.printStackTrace(); - System.exit(1); + throw new RuntimeException("Unable to import keys from [" + keyStoreFileName + "] due to exception.", t) ; } } @@ -125,10 +123,16 @@ public class JKS2RangerUtil { if (l>0) { byte[] e=new byte[l]; System.arraycopy(b,0, e, 0, l); - ret = new String(e); + ret = new String(e, Charset.defaultCharset()); } } else { - ret = new String(c.readPassword(prompt + " ")); + char[] pwd = c.readPassword(prompt + " ") ; + if (pwd == null) { + ret = null ; + } + else { + ret = new String(pwd); + } } if (ret == null) { ret = "" ;
