From 0cc454b0b120eb4eaf6f99f0db34ae871cc5ec5e Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Tue, 7 May 2024 13:22:24 +0200
Subject: [PATCH] Queries created with criteria api with many joins - fix

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
---
 .../persistence/internal/jpa/querydef/FromImpl.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
index c0ce99c2de1..bf91332b55f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 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
@@ -17,7 +17,7 @@
 package org.eclipse.persistence.internal.jpa.querydef;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Stack;
@@ -76,8 +76,8 @@ public class FromImpl<Z, X>  extends PathImpl<X> implements jakarta.persistence.
     public <T> FromImpl(Path<Z> parentPath, ManagedType managedType, Metamodel metamodel, Class<X> javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable<T> modelArtifact) {
         super(parentPath, metamodel, javaClass, expressionNode, modelArtifact);
         this.managedType = managedType;
-        this.joins = new HashSet<Join<X, ?>>();
-        this.fetches = new HashSet<Fetch<X, ?>>();
+        this.joins = new LinkedHashSet<>();
+        this.fetches = new LinkedHashSet<>();
     }
 
     public <T> FromImpl(Path<Z> parentPath, ManagedType managedType, Metamodel metamodel, Class<X> javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable<T> modelArtifact, FromImpl correlatedParent) {