From e320cb2390ec6d33210c717bca660ccc39d3adbb Mon Sep 17 00:00:00 2001
From: Steve Nolen <technolengy@gmail.com>
Date: Tue, 1 Mar 2016 08:56:26 -0800
Subject: [PATCH] bugfix: invalid token results in 500 instead of auth error

---
 .../accessrequest/AccessRequestReadRequest.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/org/ohmage/request/accessrequest/AccessRequestReadRequest.java b/src/org/ohmage/request/accessrequest/AccessRequestReadRequest.java
index d0cd8427..840c2810 100644
--- a/src/org/ohmage/request/accessrequest/AccessRequestReadRequest.java
+++ b/src/org/ohmage/request/accessrequest/AccessRequestReadRequest.java
@@ -288,13 +288,15 @@ public void respond(HttpServletRequest httpRequest, HttpServletResponse httpResp
 		
 		JSONObject jsonResult = new JSONObject();
 		
-		for(AccessRequest request : results) {
-			try {
-				jsonResult.put(request.getRequestId(), request.toJsonObject());
-			}
-			catch(JSONException e) {
-				LOGGER.error("Error building the result JSONObject.", e);
-				setFailed();
+		if (results != null){
+			for(AccessRequest request : results) {
+				try {
+					jsonResult.put(request.getRequestId(), request.toJsonObject());
+				}
+				catch(JSONException e) {
+					LOGGER.error("Error building the result JSONObject.", e);
+					setFailed();
+				}
 			}
 		}