From 06a7ee6614687a0b0cfb6116b7fb08e30b92f554 Mon Sep 17 00:00:00 2001 From: Winston Li Date: Sun, 16 Nov 2014 21:00:57 +0000 Subject: [PATCH] Corrected remoteAddr to localName. --- .../application/SnapshotPushPostbackHandler.java | 2 +- .../uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java | 2 +- .../ic/wlgitbridge/git/handler/WLReceivePackFactory.java | 2 +- .../wlgitbridge/git/handler/hook/WriteLatexPutHook.java | 8 ++++---- .../wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java | 4 ++-- .../uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java | 4 ++-- .../ac/ic/wlgitbridge/writelatex/model/WLDataModel.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java index ea8a756d65..fff9757011 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java @@ -25,7 +25,7 @@ public class SnapshotPushPostbackHandler extends AbstractHandler { } System.out.println(request.getRemoteAddr()); - System.out.println(request.getLocalAddr()); + System.out.println(request.getLocalName()); System.out.println("method: " + request.getMethod()); System.out.println("pathInfo: " + request.getPathInfo()); System.out.println("contextPath: " + request.getContextPath()); diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java index 2f636ecb63..4804a8a7e3 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java @@ -15,7 +15,7 @@ public interface WriteLatexDataSource { /* Called by request thread. */ public boolean repositoryExists(String projectName) throws FailedConnectionException; public List getWritableRepositories(String projectName) throws FailedConnectionException, InvalidProjectException; - public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException; + public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException; public void expectPostback(String projectName); /* Called by postback thread. */ diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java index 416324eef6..f5174a8fb4 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java +++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java @@ -25,7 +25,7 @@ public class WLReceivePackFactory implements ReceivePackFactory