Bug 544995 : Fixed batch fetching when shared cache is activated (multithreading issue)

Signed-off-by: Alexandre Jacob <[email protected]>

Author: ajacob

foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/mappings/ForeignReferenceMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,8 @@
 //       - 389090: JPA 2.1 DDL Generation Support (foreign key metadata support)
 //     08/12/2015-2.6 Mythily Parthasarathy
 //       - 474752: Address NPE for Embeddable with 1-M association
+//     03/03/2019-3.0 Alexandre Jacob
+//       - 544995: Fixed batch fetching when shared cache is activated (multithreading issue)
 package org.eclipse.persistence.mappings;
 
 import java.security.AccessController;
@@ -539,6 +541,9 @@ public Object extractResultFromBatchQuery(ReadQuery batchQuery, CacheKey parentC
             // If the object is already in the cache, then just return it.
             return cachedObject;
         }
+
+        boolean shouldExecuteBatchQuery = true;
+
         // Ensure the query is only executed once.
         synchronized (batchQuery) {
             // Check if query was already executed.
@@ -636,17 +641,28 @@ public Object extractResultFromBatchQuery(ReadQuery batchQuery, CacheKey parentC
                 originalPolicy.setDataResults(this, remainingParentRows);
                 translationRow = translationRow.clone();
                 translationRow.put(QUERY_BATCH_PARAMETER, foreignKeyValues);
+
+                if (foreignKeyValues.isEmpty()) {
+                    shouldExecuteBatchQuery = false;
+                }
+
                 // Register each id as null, in case it has no relationship.
                 for (Object foreignKey : foreignKeys) {
                     batchedObjects.put(foreignKey, Helper.NULL_VALUE);
                 }
             } else if (batchQuery.isReadAllQuery() && ((ReadAllQuery)batchQuery).getBatchFetchPolicy().isIN()) {
                 throw QueryException.originalQueryMustUseBatchIN(this, originalQuery);
             }
-            executeBatchQuery(batchQuery, parentCacheKey, batchedObjects, session, translationRow);
-            batchQuery.setSession(null);
+
+            // Bug 544995 : When the cache was populated by another thread we can end up having nothing to fetch
+            if (shouldExecuteBatchQuery) {
+                executeBatchQuery(batchQuery, parentCacheKey, batchedObjects, session, translationRow);
+                batchQuery.setSession(null);
+            }
         }
+
         result = batchedObjects.get(sourceKey);
+
         if (result == Helper.NULL_VALUE) {
             return null;
         } else {