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

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

Revision: 175
          http://treebase.svn.sourceforge.net/treebase/?rev=175&view=rev
Author:   rvos
Date:     2009-07-06 08:41:02 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
Now throws 404 instead of NPE when study not found

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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2009-07-06 08:37:02 UTC (rev 174)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2009-07-06 08:41:02 UTC (rev 175)
@@ -162,6 +162,9 @@
     			throw new ObjectNotFoundException("Can't find matrix " + objectId);
     		}
     		Study study = matrix.getStudy();
+			if ( study == null ) {
+				throw new ObjectNotFoundException("Can't find study for matrix "+objectId);
+			}    		
     		return base
 				.append("/downloadAMatrix.html?id=")
 				.append(study.getId())
@@ -177,6 +180,9 @@
     			throw new ObjectNotFoundException("Can't find tree " + objectId);
     		}
     		Study study = phyloTree.getStudy();
+			if ( study == null ) {
+				throw new ObjectNotFoundException("Can't find study for tree "+objectId);
+			}     		
     		return base
     			.append("/downloadATree.html?id=")
     			.append(study.getId())


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