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

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

Revision: 429
          http://treebase.svn.sourceforge.net/treebase/?rev=429&view=rev
Author:   rvos
Date:     2010-01-13 18:09:36 +0000 (Wed, 13 Jan 2010)

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

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

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-13 17:57:38 UTC (rev 428)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-13 18:09:36 UTC (rev 429)
@@ -173,15 +173,18 @@
 
 	private boolean isReviewerAccessGranted(HttpServletRequest pRequest) {
 		boolean reviewerAccessGranted = false;
-		String storedHashedStudyId = pRequest.getSession().getAttribute(Constants.X_ACCESS_CODE).toString();		
-		if ( ! TreebaseUtil.isEmpty(storedHashedStudyId) ) {
-			Long studyId = ControllerUtil.getStudyId(pRequest);
-			TreebaseIDString treebaseIDString = new TreebaseIDString(Study.class,studyId);
-			NamespacedGUID namespacedGUID = treebaseIDString.getNamespacedGUID();
-			String computedHashedStudyId = namespacedGUID.getHashedIDString();
-			if ( storedHashedStudyId.equals(computedHashedStudyId) ) {
-				reviewerAccessGranted = true;
-				saveMessage(pRequest,"You are in reviewer access mode.");
+		Object xAccesCodeObject = pRequest.getSession().getAttribute(Constants.X_ACCESS_CODE);
+		if ( xAccesCodeObject != null ) {
+			String storedHashedStudyId = xAccesCodeObject.toString();		
+			if ( ! TreebaseUtil.isEmpty(storedHashedStudyId) ) {
+				Long studyId = ControllerUtil.getStudyId(pRequest);
+				TreebaseIDString treebaseIDString = new TreebaseIDString(Study.class,studyId);
+				NamespacedGUID namespacedGUID = treebaseIDString.getNamespacedGUID();
+				String computedHashedStudyId = namespacedGUID.getHashedIDString();
+				if ( storedHashedStudyId.equals(computedHashedStudyId) ) {
+					reviewerAccessGranted = true;
+					saveMessage(pRequest,"You are in reviewer access mode.");
+				}
 			}
 		}
 		return reviewerAccessGranted;


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