From 1aec17636d8c548257cb307f8cc1e41354e00421 Mon Sep 17 00:00:00 2001
From: marco <mw.sunshine@gmx.de>
Date: Mon, 23 Nov 2015 13:58:14 -0500
Subject: [PATCH] Fix 2 possible NullPointer occurences

---
 src/main/java/com/gitblit/utils/HttpUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
index ffea81c..818ed49 100644
--- a/src/main/java/com/gitblit/utils/HttpUtils.java
+++ b/src/main/java/com/gitblit/utils/HttpUtils.java
@@ -80,7 +80,7 @@
 
         String context = request.getContextPath();
         String forwardedContext = request.getHeader("X-Forwarded-Context");
-        if (forwardedContext != null) {
+        if (StringUtils.isEmpty(forwardedContext)) {
         	forwardedContext = request.getHeader("X_Forwarded_Context");
         }
         if (!StringUtils.isEmpty(forwardedContext)) {

--
Gitblit v1.9.1