[java-plugin-shibd] 01/02: Fix logging excpression to prevent exception mid-flow.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-plugin-shibd.

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd.git;a=commit;h=95d57d5ce1e326fe2b9c05cb59947c07d1060dc1

commit 95d57d5ce1e326fe2b9c05cb59947c07d1060dc1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 17 15:13:26 2024 -0400

    Fix logging excpression to prevent exception mid-flow.
---
 .../net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml         | 4 +---
 .../endpoint/impl/shibboleth2.xml => config/impl/example-map.xml}     | 0
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
index 25c945a..96de745 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
@@ -75,7 +75,6 @@
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </action-state>
 
-    <!--  TODO: need view for this, and testing-->
     <end-state id="HandleErrorWithView" view="sp/error">
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
@@ -83,8 +82,7 @@
     <!-- Passthrough state if an exception is thrown. -->
     <action-state id="LogRuntimeException">
         <on-entry>
-            <evaluate
-                expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.sp.profile').error('Uncaught runtime exception', flowExecutionException.getCause())" />
+            <evaluate expression="LogRuntimeException.log('net.shibboleth.sp.profile', flowExecutionException)" />
         </on-entry>
         <evaluate expression="'RuntimeException'" />
         <transition to="HandleError" />
diff --git a/sp-server-impl/src/test/resources/net/shibboleth/sp/remoting/endpoint/impl/shibboleth2.xml b/sp-server-impl/src/test/resources/net/shibboleth/sp/config/impl/example-map.xml
similarity index 100%
rename from sp-server-impl/src/test/resources/net/shibboleth/sp/remoting/endpoint/impl/shibboleth2.xml
rename to sp-server-impl/src/test/resources/net/shibboleth/sp/config/impl/example-map.xml

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.