[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/messages/messages.properties

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 24 23:05:07 2016
New Revision: 8253

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8253&view=rev
Log:
Account for more esoteric flow execeptions.

Modified:
    trunk/idp-conf/src/main/resources/system/messages/messages.properties

Modified: trunk/idp-conf/src/main/resources/system/messages/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/messages/messages.properties?rev=8253&r1=8252&r2=8253&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/messages/messages.properties	(original)
+++ trunk/idp-conf/src/main/resources/system/messages/messages.properties	Tue May 24 23:05:07 2016
@@ -260,7 +260,7 @@
 
 runtime-error.title = Uncaught Exception
 runtime-error.message = <p>A software error was encountered that prevents normal operation:</p><br/> \
-                         <p><strong>#if($exception)$encoder.encodeForHTML($exception.toString())#else$encoder.encodeForHTML($flowExecutionException.getCause().toString())#end</strong></p><br/> \
+                         <p><strong>#if($exception)$encoder.encodeForHTML($exception.toString())#elseif($flowExecutionException && $flowExecutionException.getCause())$encoder.encodeForHTML($flowExecutionException.getCause().toString())#else$encoder.encodeForHTML($flowExecutionException.getMessage())#end</strong></p><br/> \
                          <p>Please report this problem to your Help Desk or administrative staff. It has \
                          also been logged for an administrator to review.</p>