Repository: knox Updated Branches: refs/heads/KNOX-481 d4ffe7036 -> dea6b5d3d KNOX-488: If any failure during deletion of alias from a cluster, exception thrown is misleading Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7b986df3 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7b986df3 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7b986df3 Branch: refs/heads/KNOX-481 Commit: 7b986df3211f8538f0bcf74d9a8118d76f262eae Parents: a8927c9 Author: Kevin Minder Authored: Thu Jan 22 09:00:02 2015 -0500 Committer: Kevin Minder Committed: Thu Jan 22 09:00:02 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java | 3 +++ .../gateway/services/security/impl/BaseKeystoreService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/7b986df3/gateway-spi/src/main/java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java index 9a8ebaf..45fcb54 100644 --- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java +++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/i18n/GatewaySpiMessages.java @@ -46,6 +46,9 @@ public interface GatewaySpiMessages { @Message( level = MessageLevel.ERROR, text = "Failed to add credential: {1}" ) void failedToAddCredential( @StackTrace( level = MessageLevel.DEBUG ) Exception e ); + @Message(level = MessageLevel.ERROR, text = "Failed to remove credential: {1}") + void failedToRemoveCredential(@StackTrace(level = MessageLevel.DEBUG) Exception e); + @Message( level = MessageLevel.ERROR, text = "Failed to get credential: {1}" ) void failedToGetCredential(@StackTrace( level = MessageLevel.DEBUG ) Exception e); http://git-wip-us.apache.org/repos/asf/knox/blob/7b986df3/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java index cf61ba8..726d9de 100644 --- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java +++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java @@ -183,7 +183,7 @@ public class BaseKeystoreService { ks.deleteEntry(alias); } } catch (KeyStoreException e) { - LOG.failedToAddCredential(e); + LOG.failedToRemoveCredential(e); } } }