From 16f15cc3c8c260433db9714c1b4cfddf2dbf802b Mon Sep 17 00:00:00 2001
From: arielak <arielak@mitre.org>
Date: Thu, 31 Jul 2014 17:48:21 -0400
Subject: [PATCH] NPE fix

---
 .../openid/connect/service/impl/MITREidDataService_1_1.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
index 4117f0b34..15722429d 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java
@@ -276,8 +276,10 @@ public class MITREidDataService_1_1 implements MITREidDataService {
         writer.endArray();
         writer.name("resourceIds");
         writer.beginArray();
-        for (String s : authReq.getResourceIds()) {
-            writer.value(s);
+        if(authReq.getResourceIds() != null) {
+            for (String s : authReq.getResourceIds()) {
+                writer.value(s);
+            }
         }
         writer.endArray();
         writer.name("authorities");