From 6b95150762ea9b7835db9e6f1867df953b3f9053 Mon Sep 17 00:00:00 2001 From: Ranie Jade Ramiso Date: Wed, 2 Jan 2013 23:53:45 +0800 Subject: [PATCH] DATAJPA-280 - Added null guards to AuditingHandler access. In case the AuditingEntityListener is declared globally and is not activated the listener is considered by the JPA infrastructure but not configured correctly. In particular no AuditingHandler gets injected which leads to NullPointerExceptions every time an entity is persisted. Added checks for null to the access and skip it if no AuditingHandler is present. --- .../data/jpa/domain/support/AuditingEntityListener.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java index b629467af..afc33a2a0 100644 --- a/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java +++ b/src/main/java/org/springframework/data/jpa/domain/support/AuditingEntityListener.java @@ -64,7 +64,9 @@ public class AuditingEntityListener { */ @PrePersist public void touchForCreate(Object target) { - handler.markCreated(target); + if (handler != null) { + handler.markCreated(target); + } } /** @@ -75,6 +77,8 @@ public class AuditingEntityListener { */ @PreUpdate public void touchForUpdate(Object target) { - handler.markModified(target); + if (handler != null) { + handler.markModified(target); + } } }