knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: KNOX-505: Failure during removing credential from Cluster should exit with proper error message. Contributed by J.Andreina.
Date Mon, 16 Feb 2015 17:24:23 GMT
Repository: knox
Updated Branches:
  refs/heads/master 2ef76e918 -> 4a2f59404


KNOX-505: Failure during removing credential from Cluster should exit with proper error message.
Contributed by J.Andreina.


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/4a2f5940
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/4a2f5940
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/4a2f5940

Branch: refs/heads/master
Commit: 4a2f59404abf631ed07c61c2495fdf481ef27b87
Parents: 2ef76e9
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Mon Feb 16 12:24:14 2015 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Mon Feb 16 12:24:14 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/gateway/GatewayMessages.java | 3 +--
 .../services/security/impl/DefaultKeystoreService.java       | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/4a2f5940/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
index 4fd2a7c..363fe7f 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
@@ -308,8 +308,7 @@ public interface GatewayMessages {
   void assumingKeyPassphraseIsMaster();
 
   @Message( level = MessageLevel.ERROR, text = "Failed to remove alias for cluster: {0} {1}."
)
-  void failedToRemoveCredentialForCluster(String clusterName,
-      KeystoreServiceException e);
+  void failedToRemoveCredentialForCluster(String clusterName, Exception e);
 
   @Message( level = MessageLevel.WARN, text = "Failed to match path {0}" )
   void failedToMatchPath( String path );

http://git-wip-us.apache.org/repos/asf/knox/blob/4a2f5940/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
index 6f5cd48..8e0cc4b 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
@@ -246,13 +246,13 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
Keyst
     try {
       writeKeystoreToFile(ks, keyStoreFile);
     } catch (KeyStoreException e) {
-      LOG.failedToAddCredentialForCluster( clusterName, e );
+      LOG.failedToRemoveCredentialForCluster(clusterName, e);
     } catch (NoSuchAlgorithmException e) {
-      LOG.failedToAddCredentialForCluster( clusterName, e );
+      LOG.failedToRemoveCredentialForCluster(clusterName, e);
     } catch (CertificateException e) {
-      LOG.failedToAddCredentialForCluster( clusterName, e );
+      LOG.failedToRemoveCredentialForCluster(clusterName, e);
     } catch (IOException e) {
-      LOG.failedToAddCredentialForCluster( clusterName, e );
+      LOG.failedToRemoveCredentialForCluster(clusterName, e);
     }
   }
 }


Mime
View raw message