Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-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 1D9D3E84C for ; Tue, 22 Jan 2013 14:46:49 +0000 (UTC) Received: (qmail 31708 invoked by uid 500); 22 Jan 2013 14:46:48 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 31678 invoked by uid 500); 22 Jan 2013 14:46:48 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 31670 invoked by uid 99); 22 Jan 2013 14:46:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2013 14:46:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2013 14:46:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ECA4723889DE; Tue, 22 Jan 2013 14:46:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1436973 - /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java Date: Tue, 22 Jan 2013 14:46:27 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130122144627.ECA4723889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Tue Jan 22 14:46:27 2013 New Revision: 1436973 URL: http://svn.apache.org/viewvc?rev=1436973&view=rev Log: NPE free Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java?rev=1436973&r1=1436972&r2=1436973&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java Tue Jan 22 14:46:27 2013 @@ -27,7 +27,7 @@ import org.springframework.stereotype.Se * @author Olivier Lamy * @since 1.4-M4 */ -@Service( "javascriptLogger#default" ) +@Service("javascriptLogger#default") public class DefaultJavascriptLogger implements JavascriptLogger { @@ -37,7 +37,10 @@ public class DefaultJavascriptLogger { Logger toUse = javascriptLog.getLoggerName() == null ? logger : LoggerFactory.getLogger( javascriptLog.getLoggerName() ); - + if ( javascriptLog.getMessage() == null ) + { + return Boolean.TRUE; + } toUse.trace( javascriptLog.getMessage() ); return Boolean.TRUE; } @@ -47,6 +50,11 @@ public class DefaultJavascriptLogger Logger toUse = javascriptLog.getLoggerName() == null ? logger : LoggerFactory.getLogger( javascriptLog.getLoggerName() ); + if ( javascriptLog.getMessage() == null ) + { + return Boolean.TRUE; + } + toUse.debug( javascriptLog.getMessage() ); return Boolean.TRUE; } @@ -56,6 +64,11 @@ public class DefaultJavascriptLogger Logger toUse = javascriptLog.getLoggerName() == null ? logger : LoggerFactory.getLogger( javascriptLog.getLoggerName() ); + if ( javascriptLog.getMessage() == null ) + { + return Boolean.TRUE; + } + toUse.info( javascriptLog.getMessage() ); return Boolean.TRUE; } @@ -65,6 +78,11 @@ public class DefaultJavascriptLogger Logger toUse = javascriptLog.getLoggerName() == null ? logger : LoggerFactory.getLogger( javascriptLog.getLoggerName() ); + if ( javascriptLog.getMessage() == null ) + { + return Boolean.TRUE; + } + toUse.warn( javascriptLog.getMessage() ); return Boolean.TRUE; } @@ -74,6 +92,11 @@ public class DefaultJavascriptLogger Logger toUse = javascriptLog.getLoggerName() == null ? logger : LoggerFactory.getLogger( javascriptLog.getLoggerName() ); + if ( javascriptLog.getMessage() == null ) + { + return Boolean.TRUE; + } + toUse.error( javascriptLog.getMessage() ); return Boolean.TRUE; }