Merge pull request #21202 from dazey3/updateECL2610_v2_integration

Fix NPE initializing EclipseLink ExpressionOperator
OpenLiberty · May 21, 2022 · 23749a2 · 23749a2
2 parents e84179d + e3b5fe2
commit 23749a2
Show file tree

Hide file tree

Showing 5 changed files with 5,154 additions and 314 deletions.
diff --git a/dev/com.ibm.websphere.appserver.thirdparty.eclipselink/bnd.bnd b/dev/com.ibm.websphere.appserver.thirdparty.eclipselink/bnd.bnd
@@ -116,8 +116,9 @@ Include-Resource: \
   @${repo;com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.jpql;${eclFullVersion};EXACT}!/!META-INF/maven/*,\
   @${repo;com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen;${eclFullVersion};EXACT}!/!META-INF/maven/*,\
   @${repo;com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.jpa;${eclFullVersion};EXACT}!/!META-INF/maven/*,\
+  org/eclipse/persistence/expressions=${bin}/org/eclipse/persistence/expressions,\
   org/eclipse/persistence/internal/helper=${bin}/org/eclipse/persistence/internal/helper,\
-  org/eclipse/persistence/descriptors=${bin}/org/eclipse/persistence/descriptors
+  org/eclipse/persistence/platform/database=${bin}/org/eclipse/persistence/platform/database
 
 publish.wlp.jar.suffix: dev/api/third-party
 
@@ -126,7 +127,9 @@ publish.wlp.jar.suffix: dev/api/third-party
 instrument.classesExcludes: \
   org/eclipse/persistence/exceptions/i18n/*.class, \
   org/eclipse/persistence/internal/localization/i18n/*.class, \
-  org/eclipse/persistence/internal/helper/*.class
+  org/eclipse/persistence/expressions/*.class, \
+  org/eclipse/persistence/internal/helper/*.class, \
+  org/eclipse/persistence/platform/database/*.class
 
 -buildpath: \
     com.ibm.ws.org.eclipse.persistence:org.eclipse.persistence.core;version=${eclFullVersion};strategy=exact,\

diff --git a/...hirdparty.eclipselink/src/org/eclipse/persistence/descriptors/TimestampLockingPolicy.java b/...hirdparty.eclipselink/src/org/eclipse/persistence/descriptors/TimestampLockingPolicy.java