Fixed a bug in getRootTaxa(). Upon passing null as the starting rank it returned...

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
index 8d828367556f2c722373029a817461d2fd073f61..91d483ffb1fed4d4a0035998263c46742abf700d 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
@@ -143,13 +143,14 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                }\r
 \r
                Criteria crit = getSession().createCriteria(Taxon.class);\r
-               //crit.add(Restrictions.isNull("taxonomicParentCache"));\r
                \r
                crit.setFetchMode("name", FetchMode.JOIN);\r
                crit.createAlias("name", "name");\r
                \r
                if (rank != null) {\r
                        crit.add(Restrictions.eq("name.rank", rank));\r
+               }else{\r
+                       crit.add(Restrictions.isNull("taxonomicParentCache"));\r
                }\r
 \r
                if (sec != null){\r
@@ -157,7 +158,7 @@ public class TaxonDaoHibernateImpl extends IdentifiableDaoBase<TaxonBase> implem
                }\r
 \r
                if (! cdmFetch.includes(CdmFetch.FETCH_CHILDTAXA())){\r
-                       logger.warn("no child taxa fetch");\r
+                       logger.info("Not fetching child taxa");\r
                        //TODO overwrite LAZY (SELECT) does not work (bug in hibernate?)\r
                        crit.setFetchMode("relationsToThisTaxon.fromTaxon", FetchMode.LAZY);\r
                }\r