You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by rm...@apache.org on 2011/01/26 10:55:30 UTC

svn commit: r1063663 - /incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java

Author: rmatthews
Date: Wed Jan 26 09:55:29 2011
New Revision: 1063663

URL: http://svn.apache.org/viewvc?rev=1063663&view=rev
Log:
Not all exceptions have a message so check for one first to avoid an NPE.

Modified:
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1063663&r1=1063662&r2=1063663&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Wed Jan 26 09:55:29 2011
@@ -181,7 +181,8 @@ public class Dispatcher {
     
         String replace = "\\$\\{";
         String withReplacement = "\\$&#x7B;";
-        requestContext.addVariable("_error-message", exception.getMessage().replaceAll(replace, withReplacement), Scope.INTERACTION);
+        String message = exception.getMessage();
+        requestContext.addVariable("_error-message", message == null ? "" : message.replaceAll(replace, withReplacement), Scope.INTERACTION);
         requestContext.addVariable("_error-details", out.toString().replaceAll(replace, withReplacement), Scope.INTERACTION);
         requestContext.clearTransientVariables();
     }