This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new c2782a060e ISIS-3282: fixes potential NPE in EclipseLink Exception 
Translation
c2782a060e is described below

commit c2782a060e173dbc12598cb568a3291219cab67a
Author: andi-huber <ahu...@apache.org>
AuthorDate: Sat Nov 19 07:50:01 2022 +0100

    ISIS-3282: fixes potential NPE in EclipseLink Exception Translation
---
 .../jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
 
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
index d90763efbf..fc51d49439 100644
--- 
a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
+++ 
b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
@@ -40,6 +40,7 @@ import 
org.springframework.orm.jpa.vendor.EclipseLinkJpaDialect;
 import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
 import org.springframework.transaction.jta.JtaTransactionManager;
 
+import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.core.config.CausewayConfiguration;
 import org.apache.causeway.persistence.jpa.eclipselink.config.ElSettings;
@@ -197,6 +198,7 @@ public class CausewayModulePersistenceJpaEclipselink 
extends JpaBaseConfiguratio
                                     "JPA operation: " + nextEx.getMessage(),
                                     extractSqlStringFromException(nextEx),
                                     nextEx))
+                    .filter(_NullSafe::isPresent) //ISIS-3282
                     .findFirst()
                     .orElse(null);
 

Reply via email to