From 4ccdfe90b73c140b330b9f7838d6cb580c98229a Mon Sep 17 00:00:00 2001 From: James Moger Date: Sat, 8 Mar 2014 20:34:55 -0500 Subject: [PATCH] Refer to receive pack client requests as 'client' --- .../gitblit/git/GitblitReceivePackFactory.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java index af5a8381..b928d851 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java @@ -69,13 +69,13 @@ public class GitblitReceivePackFactory implements ReceivePackFactory { if (req instanceof HttpServletRequest) { // http/https request may or may not be authenticated - HttpServletRequest request = (HttpServletRequest) req; - repositoryName = request.getAttribute("gitblitRepositoryName").toString(); - origin = request.getRemoteHost(); - gitblitUrl = HttpUtils.getGitblitURL(request); + HttpServletRequest client = (HttpServletRequest) req; + repositoryName = client.getAttribute("gitblitRepositoryName").toString(); + origin = client.getRemoteHost(); + gitblitUrl = HttpUtils.getGitblitURL(client); // determine pushing user - String username = request.getRemoteUser(); + String username = client.getRemoteUser(); if (!StringUtils.isEmpty(username)) { UserModel u = gitblit.getUserModel(username); if (u != null) { @@ -92,10 +92,10 @@ public class GitblitReceivePackFactory implements ReceivePackFactory { timeout = client.getDaemon().getTimeout(); } else if (req instanceof SshSession) { // SSH request is always authenticated - SshSession s = (SshSession) req; - repositoryName = s.getRepositoryName(); - origin = s.getRemoteAddress().toString(); - String username = s.getRemoteUser(); + SshSession client = (SshSession) req; + repositoryName = client.getRepositoryName(); + origin = client.getRemoteAddress().toString(); + String username = client.getRemoteUser(); user = gitblit.getUserModel(username); } -- 2.39.5