[hibernate-commits] [hibernate/hibernate-orm] 8f416e: HHH-6747 - ClassCastException when rendering Simpl...

[GitHub]

  Branch: refs/heads/4.2
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 8f416e146d5cdfbeb9d1141c2083a79d733d90e3
      https://github.com/hibernate/hibernate-orm/commit/8f416e146d5cdfbeb9d1141c2083a79d733d90e3
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/simplecase/BasicSimpleCaseTest.java

  Log Message:
  -----------
  HHH-6747 - ClassCastException when rendering SimpleCaseExpression

Conflicts:
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/SimpleCaseExpression.java


  Commit: ca8bcf58c5bb4e3ea8309e7c6f65a0506b28e7cc
      https://github.com/hibernate/hibernate-orm/commit/ca8bcf58c5bb4e3ea8309e7c6f65a0506b28e7cc
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/SqlASTFactory.java
    R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java
    R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MethodNode.java
    A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SearchedCaseNode.java
    A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SimpleCaseNode.java
    A hibernate-core/src/test/java/org/hibernate/test/hql/CaseStatementTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/simplecase/BasicSimpleCaseTest.java

  Log Message:
  -----------
  HHH-4700 - ClassCastException with parameter in
CaseNode.getFirstThenNode() (cherry picked from commit
efa5dc2f6ca1b4f20725e2d58d6afac00dff10b6)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Case2Node.java
	hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/CaseNode.java


Compare: https://github.com/hibernate/hibernate-orm/compare/f1ddacda4727...ca8bcf58c5bb