[Openutils-svn] SF.net SVN: openutils:[4625] branches/openutils-bshd5-backport

[<gca...@us...>]

Revision: 4625
          http://openutils.svn.sourceforge.net/openutils/?rev=4625&view=rev
Author:   gcatania
Date:     2015-04-17 08:48:02 +0000 (Fri, 17 Apr 2015)
Log Message:
-----------
Merged revisions 4624 via svnmerge from 
svn+ssh://gca...@sv.../p/openutils/code/trunk/openutils-bshd5

........
  r4624 | gcatania | 2015-04-17 10:43:39 +0200 (ven, 17 apr 2015) | 1 line
  
  BSHD-27 regression after refactoring - distinct root entity transformer got lost
........

Revision Links:
--------------
    http://openutils.svn.sourceforge.net/openutils/?rev=4624&view=rev

Modified Paths:
--------------
    branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java

Property Changed:
----------------
    branches/openutils-bshd5-backport/

Index: branches/openutils-bshd5-backport
===================================================================
--- branches/openutils-bshd5-backport	2015-04-17 08:43:39 UTC (rev 4624)
+++ branches/openutils-bshd5-backport	2015-04-17 08:48:02 UTC (rev 4625)

Property changes on: branches/openutils-bshd5-backport
___________________________________________________________________
Modified: svnmerge-integrated
## -1 +1 ##
-/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4203,4383,4572-4573,4575,4577,4585,4587-4588
+/trunk/openutils-bshd5:1-4040,4042-4056,4058-4092,4095-4096,4098-4195,4197-4239,4241-4409,4411-4452,4455,4457-4570,4572-4624
\ No newline at end of property
Modified: branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java
===================================================================
--- branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2015-04-17 08:43:39 UTC (rev 4624)
+++ branches/openutils-bshd5-backport/src/main/java/it/openutils/dao/hibernate/HibernateDAOImpl.java	2015-04-17 08:48:02 UTC (rev 4625)
@@ -814,7 +814,8 @@
         @Override
         protected Criteria createCriteria(Session session)
         {
-            Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session);
+            Criteria crit = new FilterMetadataSupport(rootEntity, filterMetadata).create(session).setResultTransformer(
+                CriteriaSpecification.DISTINCT_ROOT_ENTITY);
             if (additionalCriteria != null)
             {
                 for (Criterion c : additionalCriteria)
@@ -847,19 +848,14 @@
         {
             super(rootEntity, maxResults, page, metadata, additionalCriteria, orders);
             this.properties = properties;
-
         }
 
         @Override
         protected Criteria createCriteria(Session session)
         {
             Criteria crit = super.createCriteria(session);
-            if (CollectionUtils.isEmpty(properties))
+            if (CollectionUtils.isNotEmpty(properties))
             {
-                crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-            }
-            else
-            {
                 ProjectionList projectionList = Projections.projectionList();
                 for (String property : properties)
                 {
@@ -941,7 +937,7 @@
     @Override
     protected Criteria createCriteria(Session session)
     {
-        return exampleTree.create(session);
+        return exampleTree.create(session).setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
     }
 }
 
@@ -966,12 +962,8 @@
     protected Criteria createCriteria(Session session)
     {
         Criteria crit = super.createCriteria(session);
-        if (CollectionUtils.isEmpty(properties))
+        if (CollectionUtils.isNotEmpty(properties))
         {
-            crit.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
-        }
-        else
-        {
             ProjectionList projectionList = Projections.projectionList();
             for (String property : properties)
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.