From 8ee7c8d2f1f53c72c4f47dde1093cb3db1f27dcb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Fix deleteAllKeys method signature
---
src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java | 2 +-
src/main/java/com/gitblit/transport/ssh/FileKeyManager.java | 2 +-
src/main/java/com/gitblit/transport/ssh/IKeyManager.java | 2 +-
src/main/java/com/gitblit/transport/ssh/NullKeyManager.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
index f590ab2..04b42fc 100644
--- a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
@@ -147,7 +147,7 @@
}
@Override
- public boolean removeAllKey(String username) {
+ public boolean removeAllKeys(String username) {
return FileUtils.delete(getKeystore(username));
}
diff --git a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
index 3528bf1..cb32a02 100644
--- a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
@@ -37,5 +37,5 @@
boolean removeKey(String username, String data);
- boolean removeAllKey(String username);
+ boolean removeAllKeys(String username);
}
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 6990d0d..454d3cf 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -65,7 +65,7 @@
}
@Override
- public boolean removeAllKey(String username) {
+ public boolean removeAllKeys(String username) {
return false;
}
}
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
index 98d9aba..767f3cb 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
@@ -84,7 +84,7 @@
private void deleteSshKeys(List<String> sshKeys) {
IKeyManager keyManager = authenticator.getKeyManager();
if (sshKeys.contains(ALL)) {
- keyManager.removeAllKey(user);
+ keyManager.removeAllKeys(user);
} else {
for (String sshKey : sshKeys) {
keyManager.removeKey(user, sshKey);
--
Gitblit v1.9.1