You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by cz...@apache.org on 2018/08/20 07:26:04 UTC

svn commit: r1838410 - /felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java

Author: cziegeler
Date: Mon Aug 20 07:26:04 2018
New Revision: 1838410

URL: http://svn.apache.org/viewvc?rev=1838410&view=rev
Log:
FELIX-5897 : org.apache.felix.http.proxy.ProxyServlet NullPointerException. Apply patch from David Nebinger

Modified:
    felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java

Modified: felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java?rev=1838410&r1=1838409&r2=1838410&view=diff
==============================================================================
--- felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java (original)
+++ felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/ProxyServlet.java Mon Aug 20 07:26:04 2018
@@ -129,7 +129,10 @@ public final class ProxyServlet
     @Override
     public void destroy()
     {
-        this.tracker.close();
+        if ( this.tracker != null ) {
+            this.tracker.close();
+            this.tracker = null;
+        }
         super.destroy();
     }