From 8806054ad886056dfc57df7ae3344835d8e5f749 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Thu, 12 Feb 2015 13:38:09 -0800
Subject: [PATCH] HHH-9597 : Criteria creates invalid column aliases

(cherry picked from commit 36cc2c836c5aed9b2f52500f9715f3de8fe40f5a)
---
 .../src/main/java/org/hibernate/loader/JoinWalker.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
index cfc461e0a4..d1a25fb555 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
@@ -1108,7 +1108,11 @@ protected final String selectString(List associations)
 					buf.append(", ").append(selectFragment);
 				}
 				if ( joinable.consumesEntityAlias() ) entityAliasCount++;
-				if ( joinable.consumesCollectionAlias() && join.getJoinType()==JoinType.LEFT_OUTER_JOIN ) collectionAliasCount++;
+				if ( joinable.consumesCollectionAlias() &&
+						join.getJoinType()==JoinType.LEFT_OUTER_JOIN &&
+						!join.hasRestriction() ) {
+					collectionAliasCount++;
+				}
 			}
 			return buf.toString();
 		}