From 28980c3d6d989b900d02e3357473294561334e4a Mon Sep 17 00:00:00 2001
From: Joel Johnson <joel.johnson@issinc.com>
Date: Mon, 29 Jun 2015 12:19:07 -0400
Subject: [PATCH] use JEE 3.0 to allow cookie session tracking
---
src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index d2ddc2c..e989ece 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -19,8 +19,6 @@
import java.net.URL;
import java.text.MessageFormat;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +32,8 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
/**
* Handles requests for Sparkleshare Invites
@@ -89,7 +89,7 @@
response.getWriter().append("SSH is not active on this server!");
return;
}
- int sshDisplayPort = settings.getInteger(Keys.git.sshDisplayPort, sshPort);
+ int sshDisplayPort = settings.getInteger(Keys.git.sshAdvertisedPort, sshPort);
// extract repo name from request
String repoUrl = request.getPathInfo().substring(1);
@@ -114,7 +114,7 @@
if (!StringUtils.isEmpty(url) && url.indexOf("localhost") == -1) {
host = new URL(url).getHost();
}
- String sshDisplayHost = settings.getString(Keys.git.sshDisplayHost, "");
+ String sshDisplayHost = settings.getString(Keys.git.sshAdvertisedHost, "");
if(sshDisplayHost.isEmpty()) {
sshDisplayHost = host;
}
--
Gitblit v1.9.1