Refer to receive pack client requests as 'client'

James Moger

2014-03-08 4ccdfe90b73c140b330b9f7838d6cb580c98229a

Refer to receive pack client requests as 'client'

 src/main/java/com/gitblit/git/GitblitReceivePackFactory.java

@@ -69,13 +69,13 @@

        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 @@
            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);
        }