API tools faq
paste
Guest User

Untitled

a guest
Jan 16th, 2019
70
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.21 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
  2. index 850a8b3..7750baa 100644
  3. --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
  4. +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/Binder.java
  5. @@ -675,7 +675,13 @@
  6. final EntityDiscriminator discriminator =
  7. new EntityDiscriminator( value, discriminatorSource.isInserted(), discriminatorSource.isForced() );
  8. rootEntityBinding.getHierarchyDetails().setEntityDiscriminator( discriminator );
  9. - rootEntityBinding.setDiscriminatorMatchValue( rootEntitySource.getDiscriminatorMatchValue() );
  10. + final String discriminatorValue = rootEntitySource.getDiscriminatorMatchValue();
  11. + if ( discriminatorValue != null ) {
  12. + rootEntityBinding.setDiscriminatorMatchValue( discriminatorValue );
  13. + }
  14. + else {
  15. + rootEntityBinding.setDiscriminatorMatchValue( rootEntitySource.getClassName() );
  16. + }
  17. // Configure discriminator hibernate type
  18. final String typeName =
  19. discriminatorSource.getExplicitHibernateTypeName() != null
  20. @@ -1777,6 +1783,9 @@
  21. if ( discriminatorValue != null ) {
  22. entityBinding.setDiscriminatorMatchValue( discriminatorValue );
  23. }
  24. + else {
  25. + entityBinding.setDiscriminatorMatchValue( entityClassName );
  26. + }
  27. }
  28. else {
  29. bindPrimaryTable( entityBinding, entitySource );
  30. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
  31. index 2494f7f..2f4c48d 100644
  32. --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
  33. +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
  34. @@ -235,11 +235,7 @@
  35. }
  36.  
  37. public String getDiscriminatorMatchValue() {
  38. - if ( discriminatorMatchValue == null) {
  39. - return getClassInfo().name().toString();
  40. - } else {
  41. - return discriminatorMatchValue;
  42. - }
  43. + return discriminatorMatchValue;
  44. }
  45.  
  46. public List<JpaCallbackSource> getJpaCallbacks() {
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!