Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36DA6173EF for ; Sat, 13 Jun 2015 11:10:20 +0000 (UTC) Received: (qmail 33457 invoked by uid 500); 13 Jun 2015 11:10:20 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 33416 invoked by uid 500); 13 Jun 2015 11:10:20 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 33407 invoked by uid 99); 13 Jun 2015 11:10:20 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Jun 2015 11:10:20 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id EBBD0AC0553 for ; Sat, 13 Jun 2015 11:10:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1685239 - in /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal: console/HttpServicePlugin.java dispatch/Dispatcher.java dispatch/InvocationChain.java Date: Sat, 13 Jun 2015 11:10:19 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150613111019.EBBD0AC0553@hades.apache.org> Author: cziegeler Date: Sat Jun 13 11:10:19 2015 New Revision: 1685239 URL: http://svn.apache.org/r1685239 Log: FELIX-4543 : Update webconsole plugin Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java?rev=1685239&r1=1685238&r2=1685239&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java Sat Jun 13 11:10:19 2015 @@ -362,17 +362,21 @@ public class HttpServicePlugin extends H for(final String val : columns) { pw.print(""); - String text = escapeXml(val).replace("\n", "
"); - int pos; - while ( (pos = text.indexOf("${#link:")) != -1) { - final int endPos = text.indexOf("}", pos); - final int bundleId = Integer.valueOf(text.substring(pos + 8, endPos)); - final int tokenEndPos = text.indexOf("${link#}", pos); + if ( val != null ) + { + String text = escapeXml(val).replace("\n", "
"); + int pos; + while ( (pos = text.indexOf("${#link:")) != -1) + { + final int endPos = text.indexOf("}", pos); + final int bundleId = Integer.valueOf(text.substring(pos + 8, endPos)); + final int tokenEndPos = text.indexOf("${link#}", pos); - text = text.substring(0, pos) + "" + - text.substring(endPos + 1, tokenEndPos) + "" + text.substring(tokenEndPos + 8); + text = text.substring(0, pos) + "" + + text.substring(endPos + 1, tokenEndPos) + "" + text.substring(tokenEndPos + 8); + } + pw.print(text); } - pw.print(text); pw.println(""); } Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java?rev=1685239&r1=1685238&r2=1685239&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java Sat Jun 13 11:10:19 2015 @@ -56,6 +56,7 @@ import org.apache.felix.http.base.intern import org.apache.felix.http.base.internal.handler.FilterHandler; import org.apache.felix.http.base.internal.handler.HttpSessionWrapper; import org.apache.felix.http.base.internal.handler.ServletHandler; +import org.apache.felix.http.base.internal.logger.SystemLogger; import org.apache.felix.http.base.internal.registry.HandlerRegistry; import org.apache.felix.http.base.internal.registry.PathResolution; import org.apache.felix.http.base.internal.registry.PerContextHandlerRegistry; @@ -622,6 +623,7 @@ public final class Dispatcher implements } catch ( final Exception e) { + SystemLogger.error("Exception while processing request to " + requestURI, e); req.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e); req.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE, e.getClass().getName()); @@ -683,8 +685,8 @@ public final class Dispatcher implements */ void forward(final ServletResolution resolution, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String requestURI = getRequestURI(request); - FilterHandler[] filterHandlers = this.handlerRegistry.getFilters(resolution, DispatcherType.FORWARD, requestURI); + final String requestURI = getRequestURI(request); + final FilterHandler[] filterHandlers = this.handlerRegistry.getFilters(resolution, DispatcherType.FORWARD, requestURI); invokeChain(resolution.handler, filterHandlers, request, response); } @@ -696,8 +698,8 @@ public final class Dispatcher implements */ void include(final ServletResolution resolution, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String requestURI = getRequestURI(request); - FilterHandler[] filterHandlers = this.handlerRegistry.getFilters(resolution, DispatcherType.INCLUDE, requestURI); + final String requestURI = getRequestURI(request); + final FilterHandler[] filterHandlers = this.handlerRegistry.getFilters(resolution, DispatcherType.INCLUDE, requestURI); invokeChain(resolution.handler, filterHandlers, request, response); } Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java?rev=1685239&r1=1685238&r2=1685239&view=diff ============================================================================== --- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java (original) +++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java Sat Jun 13 11:10:19 2015 @@ -46,7 +46,7 @@ public class InvocationChain implements } @Override - public final void doFilter(ServletRequest req, ServletResponse res) throws IOException, ServletException + public final void doFilter(@Nonnull final ServletRequest req, @Nonnull final ServletResponse res) throws IOException, ServletException { if ( this.index == -1 ) {