[java-identity-provider] branch maint-4 updated: Add some null checks.

Scott Cantor cantor.2 at osu.edu
Tue Dec 6 14:10:07 UTC 2022


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

scantor pushed a commit to branch maint-4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=dcfb652e56f226a48fcee83530faeee46e8422ad

The following commit(s) were added to refs/heads/maint-4 by this push:
     new dcfb652e5 Add some null checks.
dcfb652e5 is described below

commit dcfb652e56f226a48fcee83530faeee46e8422ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 6 09:10:04 2022 -0500

    Add some null checks.
---
 .../java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
index 5c481465a..240d9e7e4 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
@@ -296,9 +296,9 @@ public class WriteAuditLog extends AbstractProfileAction {
                         
                         if (IdPAuditFields.EVENT_TIME.equals(field)) {
                             record.append(dateTimeFormatter.format(Instant.now()));
-                        } else if (IdPAuditFields.EVENT_TYPE.equals(field)) {
+                        } else if (IdPAuditFields.EVENT_TYPE.equals(field) && requestContext != null) {
                             final Event event = requestContext.getCurrentEvent();
-                            if (event != null && !event.getId().equals(EventIds.PROCEED_EVENT_ID)) {
+                            if (event != null && !EventIds.PROCEED_EVENT_ID.equals(event.getId())) {
                                 record.append(event.getId());
                             }
                         } else if (IdPAuditFields.PROFILE.equals(field)) {

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


More information about the commits mailing list