Author: andrew.plotnikov
Date: 2012-03-30 04:31:44 -0400 (Fri, 30 Mar 2012)
New Revision: 5995
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java
kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java
Log:
EXOJCR-1815: Fixed LogMessageFormatter.getMessage throws NPE if object.toString() return
null
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java
===================================================================
---
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30
08:27:11 UTC (rev 5994)
+++
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30
08:31:44 UTC (rev 5995)
@@ -41,13 +41,11 @@
{
if (i != argsArray.length - 1 || !(argsArray[i] instanceof Throwable))
{
- str =
REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i]));
+ str =
REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i].toString()));
}
}
}
return str;
-
-
}
public static Throwable getThrowable(Object... argsArray)
Modified:
kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java
===================================================================
---
kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30
08:27:11 UTC (rev 5994)
+++
kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30
08:31:44 UTC (rev 5995)
@@ -57,4 +57,17 @@
assertEquals(t, LogMessageFormatter.getThrowable(new Object(), t));
assertEquals(t, LogMessageFormatter.getThrowable("Just testing{}", new
Object(), t));
}
+
+ public void testMessageIsNull() throws Exception
+ {
+ LogMessageFormatter.getMessage("Hello, World {} ", new A());
+ }
+
+ class A
+ {
+ public String toString()
+ {
+ return null;
+ }
+ }
}
Show replies by date