[hibernate-commits] [hibernate/hibernate-orm] 568b42: HHH-10161 : Hibernate ignores return value from ja...

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 568b427d46db85c45141c970c49495014ed90312
      https://github.com/hibernate/hibernate-orm/commit/568b427d46db85c45141c970c49495014ed90312
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
    M hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java
    M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Item.java
    M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java

  Log Message:
  -----------
  HHH-10161 : Hibernate ignores return value from javax.persistence.Parameter#getParameterType()

(cherry picked from commit b4dbb90f1719c95f31434122150c5f3f6fd9dd8d)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/BaseQueryImpl.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Item.java
	hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/query/QueryTest.java

HHH-10161 : Incorporate changes from conflicts