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

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

Revision: 501
          http://treebase.svn.sourceforge.net/treebase/?rev=501&view=rev
Author:   rvos
Date:     2010-02-15 13:52:32 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Obtaining the Study in a different way, this should address an NPE I've been having.

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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractDownloadController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractDownloadController.java	2010-02-15 13:32:51 UTC (rev 500)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractDownloadController.java	2010-02-15 13:52:32 UTC (rev 501)
@@ -158,7 +158,8 @@
 	}
 	
 	private boolean isSubmitter (long objectId,HttpServletRequest request) {
-		Study study = getStudy(objectId,request);
+		Study study = ControllerUtil.findStudy(request, getStudyService());
+		//Study study = getStudy(objectId,request);
 		Submission submission = study.getSubmission();
 		TBPermission tbp = getSubmissionService().getPermission(request.getRemoteUser(), submission.getId());
 		if (tbp == TBPermission.WRITE || tbp == TBPermission.READ_ONLY || tbp == TBPermission.SUBMITTED_WRITE) {


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