You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/10 10:15:08 UTC

svn commit: r1630711 - /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java

Author: rmannibucau
Date: Fri Oct 10 08:15:08 2014
New Revision: 1630711

URL: http://svn.apache.org/r1630711
Log:
not sure why it was not backported, we can get null message doing logger.xxx(e.getMessage(), e) depending on e - UnsupportedOperation does it

Modified:
    tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java

Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1630711&r1=1630710&r2=1630711&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Fri Oct 10 08:15:08 2014
@@ -663,8 +663,11 @@ public class Logger {
      * @return String
      */
     private String getMessage(final String key, final String baseName) {
-        try {
+        if (key == null) { // hehe, can happen
+            return "null";
+        }
 
+        try {
             final ResourceBundle bundle = bundleCache.compute(baseName);
             if (bundle != null) {
                 try {