You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/22 15:46:27 UTC
svn commit: r1436973 -
/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultJavascriptLogger.java
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;
}