From b5c7332f5976cc19ab681ed4b82501a62c6a2f61 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gmail.com> Date: Tue, 30 Jun 2015 08:48:35 -0400 Subject: [PATCH] Merge pull request #277 from mrjoel/mrjoel-serverNPEfix --- src/main/java/com/gitblit/fanout/FanoutConstants.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/fanout/FanoutConstants.java b/src/main/java/com/gitblit/fanout/FanoutConstants.java index 6e6964c..84fd2c5 100644 --- a/src/main/java/com/gitblit/fanout/FanoutConstants.java +++ b/src/main/java/com/gitblit/fanout/FanoutConstants.java @@ -25,11 +25,11 @@ public final static String CH_DEBUG = "debug"; public final static String MSG_CONNECTED = "connected..."; public final static String MSG_BUSY = "busy"; - + public static String getRemoteSocketId(Socket socket) { return socket.getInetAddress().getHostAddress() + ":" + socket.getPort(); } - + public static String getLocalSocketId(Socket socket) { return socket.getInetAddress().getHostAddress() + ":" + socket.getLocalPort(); } -- Gitblit v1.9.1