From 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 Oct 2015 08:12:43 -0400
Subject: [PATCH] Merge branch 'topic/pr-934' into develop
---
src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java b/src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java
index 4d8ea4b..af25251 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshDaemonClient.java
@@ -17,7 +17,7 @@
import java.net.SocketAddress;
-import org.apache.sshd.common.Session.AttributeKey;
+import org.apache.sshd.common.session.Session.AttributeKey;
import com.gitblit.models.UserModel;
@@ -32,6 +32,7 @@
private final SocketAddress remoteAddress;
private volatile UserModel user;
+ private volatile SshKey key;
private volatile String repositoryName;
SshDaemonClient(SocketAddress peer) {
@@ -61,4 +62,13 @@
public String getRepositoryName() {
return repositoryName;
}
+
+ public SshKey getKey() {
+ return key;
+ }
+
+ public void setKey(SshKey key) {
+ this.key = key;
+ }
+
}
--
Gitblit v1.9.1