Fixed a null walltime bug

bd2kccd · Mar 17, 2017 · 27c06e7 · 27c06e7
1 parent 16f25b8
commit 27c06e7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/edu/pitt/dbmi/ccd/rest/client/util/JsonUtils.java b/src/main/java/edu/pitt/dbmi/ccd/rest/client/util/JsonUtils.java
@@ -7,6 +7,7 @@
 import java.util.Set;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import edu.pitt.dbmi.ccd.rest.client.dto.algo.AlgorithmInfo;
@@ -33,14 +34,16 @@ public static JsonWebToken parseJSONObjectToJsonWebToken(JSONObject jObj) {
 		long issuedTime = jObj.getLong("issuedTime");
 		long lifetime = jObj.getLong("lifetime");
 		long expireTime = jObj.getLong("expireTime");
-		JSONArray wallTimeArray = jObj.getJSONArray("wallTime");
 		String[] wallTime = null;
 
-		if(wallTimeArray.length() > 0){
-			wallTime = new String[wallTimeArray.length()];
-			for(int index=0;index<wallTimeArray.length();index++){
-				Object obj = wallTimeArray.get(index);
-				wallTime[index] = obj.toString();
+		if(!jObj.isNull("wallTime")){
+			JSONArray wallTimeArray = jObj.getJSONArray("wallTime");
+			if(wallTimeArray != null && wallTimeArray.length() > 0){
+				wallTime = new String[wallTimeArray.length()];
+				for(int index=0;index<wallTimeArray.length();index++){
+					Object obj = wallTimeArray.get(index);
+					wallTime[index] = obj.toString();
+				}
 			}
 		}