[Treebase-guts] SF.net SVN: treebase:[863] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/DownloadATreeController.java

[<rv...@us...>]

Revision: 863
          http://treebase.svn.sourceforge.net/treebase/?rev=863&view=rev
Author:   rvos
Date:     2011-05-12 20:39:59 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Passing in the containing study to the overloaded serialize method is supposed to prevent the NPEs we were apparently getting when trying to download a tree as nexml (not a study). This should fix things.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java	2011-05-12 20:36:56 UTC (rev 862)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java	2011-05-12 20:39:59 UTC (rev 863)
@@ -96,7 +96,7 @@
 			treeBlock.setTaxonLabelSet(tls);
 			treeBlock.addPhyloTree(tree);
 			nds.getTreeBlocks().add(treeBlock);
-			return getNexmlService().serialize(nds,getDefaultProperties(request));
+			return getNexmlService().serialize(nds,getDefaultProperties(request),tree.getStudy());
 		}
 		else if ( getFormat(request) == FORMAT_RDF ) {
 			NexusDataSet nds = new NexusDataSet();
@@ -105,7 +105,7 @@
 			treeBlock.setTaxonLabelSet(tls);
 			treeBlock.addPhyloTree(tree);
 			nds.getTreeBlocks().add(treeBlock);			
-			return getRdfaService().serialize(nds,getDefaultProperties(request));			
+			return getRdfaService().serialize(nds,getDefaultProperties(request),tree.getStudy());			
 		}		
 		else {
 			StringBuilder builder = new StringBuilder();


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