From d0d0963c18d75950533591962d95ece2116eaffd Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Wed, 17 Jun 2015 15:41:19 -0700
Subject: [PATCH] HHH-2851 : ParameterTranslationsImpl fails to correctly
 determine parameter type

---
 .../ast/ParameterTranslationsImpl.java        |  5 ++
 .../test/hql/ASTParserLoadingTest.java        | 80 +++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java
index 89c7fcb100e6..f5f837c26161 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/ParameterTranslationsImpl.java
@@ -108,6 +108,11 @@ else if ( NamedParameterSpecification.class.isInstance( spec ) ) {
 					paramHolder.type = namedSpec.getExpectedType();
 					namedParameterMap.put( namedSpec.getName(), paramHolder );
 				}
+				else if ( paramHolder.type == null && namedSpec.getExpectedType() != null ) {
+					// previous reference to the named parameter did not have type determined;
+					// this time, it can be determined by namedSpec.getExpectedType().
+					paramHolder.type = namedSpec.getExpectedType();
+				}
 				paramHolder.positions.add( i );
 			}
 			// don't care about other param types here, just those explicitly user-defined...
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
index 39652a0bf926..ab9f3354040f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
@@ -644,6 +644,86 @@ public void testEmptyInList() {
 		session.close();
 	}
 
+	@Test
+	@TestForIssue( jiraKey = "HHH-2851")
+	public void testMultipleRefsToSameParam() {
+		Session s = openSession();
+		s.beginTransaction();
+		Human h = new Human();
+		h.setName( new Name( "Johnny", 'B', "Goode" ) );
+		s.save( h );
+		h = new Human();
+		h.setName( new Name( "Steve", null, "Ebersole" ) );
+		s.save( h );
+		h = new Human();
+		h.setName( new Name( "Bono", null, null ) );
+		s.save( h );
+		h = new Human();
+		h.setName( new Name( "Steve", 'Z', "Johnny" ) );
+		h.setIntValue( 1 );
+		s.save( h );
+		h = new Human();
+		h.setName( new Name( null, null, null ) );
+		s.save( h );
+		s.getTransaction().commit();
+		s.close();
+
+		s = openSession();
+		s.beginTransaction();
+		List results = s.createQuery( "from Human where name.first = :name or name.last=:name" )
+				.setParameter( "name", "Johnny" )
+				.list();
+		assertEquals( 2, results.size() );
+
+		results = s.createQuery( "from Human where name.last = :name or :name is null" )
+				.setParameter( "name", "Goode" )
+				.list();
+		assertEquals( 1, results.size() );
+		results = s.createQuery( "from Human where :name is null or name.last = :name" )
+				.setParameter( "name", "Goode" )
+				.list();
+		assertEquals( 1, results.size() );
+
+		results = s.createQuery( "from Human where name.first = :firstName and (name.last = :name or :name is null)" )
+				.setParameter( "firstName", "Bono" )
+				.setParameter( "name", null )
+				.list();
+		assertEquals( 1, results.size() );
+		results = s.createQuery( "from Human where name.first = :firstName and ( :name is null or name.last = :name )" )
+				.setParameter( "firstName", "Bono" )
+				.setParameter( "name", null )
+				.list();
+		assertEquals( 1, results.size() );
+
+		results = s.createQuery( "from Human where intValue = :intVal or :intVal is null" )
+				.setParameter( "intVal", 1 )
+				.list();
+		assertEquals( 1, results.size() );
+		results = s.createQuery( "from Human where :intVal is null or intValue = :intVal" )
+				.setParameter( "intVal", 1 )
+				.list();
+		assertEquals( 1, results.size() );
+
+
+		results = s.createQuery( "from Human where intValue = :intVal or :intVal is null" )
+				.setParameter( "intVal", null )
+				.list();
+		assertEquals( 5, results.size() );
+		results = s.createQuery( "from Human where :intVal is null or intValue = :intVal" )
+				.setParameter( "intVal", null )
+				.list();
+		assertEquals( 5, results.size() );
+
+		s.getTransaction().commit();
+		s.close();
+
+		s = openSession();
+		s.beginTransaction();
+		s.createQuery( "delete Human" ).executeUpdate();
+		s.getTransaction().commit();
+		s.close();
+	}
+
 	@Test
 	public void testComponentNullnessChecks() {
 		Session s = openSession();