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

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

Revision: 434
          http://treebase.svn.sourceforge.net/treebase/?rev=434&view=rev
Author:   rvos
Date:     2010-01-14 14:36:58 +0000 (Thu, 14 Jan 2010)

Log Message:
-----------
NPE workaround

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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSubmissionController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSubmissionController.java	2010-01-14 14:28:21 UTC (rev 433)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSubmissionController.java	2010-01-14 14:36:58 UTC (rev 434)
@@ -1,6 +1,10 @@
 
 package org.cipres.treebase.web.controllers;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -8,7 +12,9 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 
+import org.cipres.treebase.domain.admin.User;
 import org.cipres.treebase.domain.admin.UserService;
+import org.cipres.treebase.domain.study.Submission;
 import org.cipres.treebase.domain.study.SubmissionService;
 import org.cipres.treebase.web.Constants;
 import org.cipres.treebase.web.util.ControllerUtil;
@@ -87,8 +93,16 @@
 		boolean isUser = request.isUserInRole("User");
 		request.getSession().setAttribute("isUser", Boolean.valueOf(isUser));
 
-		return new ModelAndView("submissionList", Constants.SUBMISSION_LIST, ControllerUtil
-			.getUser(request, mUserService).getSubmissionIterator());
+		User user = ControllerUtil.getUser(request, mUserService);
+		List<Submission> submissionList = new ArrayList<Submission>();
+		Iterator<Submission> submissionIterator = submissionList.iterator();
+		if ( user != null ) {
+			submissionIterator = user.getSubmissionIterator();
+		}
+		return new ModelAndView(
+			"submissionList",
+			Constants.SUBMISSION_LIST,
+			submissionIterator);
 	}
 
 	/**


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