[Treebase-guts] SF.net SVN: treebase:[995] trunk/treebase-core/src/main/java/org/cipres/ treebase/dao/tree/PhyloTreeDAO.java

[<hs...@us...>]

Revision: 995
          http://treebase.svn.sourceforge.net/treebase/?rev=995&view=rev
Author:   hshyket
Date:     2011-12-06 19:31:48 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Fixing issues where deleting a tree block would not delete new orphaned taxon label sets

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/dao/tree/PhyloTreeDAO.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/tree/PhyloTreeDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/tree/PhyloTreeDAO.java	2011-12-06 19:24:05 UTC (rev 994)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/tree/PhyloTreeDAO.java	2011-12-06 19:31:48 UTC (rev 995)
@@ -125,9 +125,9 @@
 				block.removePhyloTree(pTree);
 
 				if (block.isEmpty()) {
-					TaxonLabelSet tSet=block.getTaxonLabelSet();
+					//TaxonLabelSet tSet=block.getTaxonLabelSet();
 					deleteTreeBlock(block);
-					getTaxonLabelHome().clean(tSet);
+					//getTaxonLabelHome().clean(tSet);
 				}
 			}
 
@@ -172,7 +172,9 @@
 	 */
 	public void deleteTreeBlock(TreeBlock pTreeBlock) {
 		if (pTreeBlock != null && pTreeBlock.getId() != null) {
-
+			
+			TaxonLabelSet tSet=pTreeBlock.getTaxonLabelSet();
+			
 			// bi-directional relationships:
 			// * submission -> treeblock
 			Submission sub = getSubmissionHome().findByTreeBlock(pTreeBlock);
@@ -187,7 +189,9 @@
 				realDelete(tree);
 			}
 
-			getHibernateTemplate().delete(pTreeBlock);
+			;getHibernateTemplate().delete(pTreeBlock);
+			
+			getTaxonLabelHome().clean(tSet);
 		}
 	}
 

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