From c0c5b206bb8d61fb82f09511f8b0214b64f726f4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 15 Jun 2015 10:31:07 -0400
Subject: [PATCH] Merged #257 "Bump to JGit 4.0.0"
---
src/main/java/com/gitblit/transport/ssh/NullKeyManager.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 25860d6..fcd3e19 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -15,8 +15,9 @@
*/
package com.gitblit.transport.ssh;
-import java.security.PublicKey;
import java.util.List;
+
+import com.google.inject.Inject;
/**
* Rejects all public key management requests.
@@ -26,6 +27,7 @@
*/
public class NullKeyManager extends IPublicKeyManager {
+ @Inject
public NullKeyManager() {
}
@@ -56,17 +58,17 @@
}
@Override
- protected List<PublicKey> getKeysImpl(String username) {
+ protected List<SshKey> getKeysImpl(String username) {
return null;
}
@Override
- public boolean addKey(String username, String data) {
+ public boolean addKey(String username, SshKey key) {
return false;
}
@Override
- public boolean removeKey(String username, String data) {
+ public boolean removeKey(String username, SshKey key) {
return false;
}
--
Gitblit v1.9.1