From ae6be978ff7fc97cc71de3ba0f6b8316e6fe47e8 Mon Sep 17 00:00:00 2001
From: Asadulla Zaid <asadulla.mir@honeywell.com>
Date: Thu, 30 Jul 2020 16:02:40 +0530
Subject: [PATCH] fix: added null check which was causing crashes for our users

---
 .../java/com/microsoft/aad/adal/TokenCacheAccessor.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/adal/src/main/java/com/microsoft/aad/adal/TokenCacheAccessor.java b/adal/src/main/java/com/microsoft/aad/adal/TokenCacheAccessor.java
index 8e85d5d6f..06fcb2982 100644
--- a/adal/src/main/java/com/microsoft/aad/adal/TokenCacheAccessor.java
+++ b/adal/src/main/java/com/microsoft/aad/adal/TokenCacheAccessor.java
@@ -437,8 +437,12 @@ boolean isMultipleMRRTsMatchingGivenApp(final String clientId) {
         final List<TokenCacheItem> mrrtsMatchingRequest = new ArrayList<>();
         while (allItems.hasNext()) {
             final TokenCacheItem tokenCacheItem = allItems.next();
-            if (tokenCacheItem.getAuthority().equalsIgnoreCase(mAuthority) && tokenCacheItem.getClientId().equalsIgnoreCase(clientId)
-                    && (tokenCacheItem.getIsMultiResourceRefreshToken() || StringExtensions.isNullOrBlank(tokenCacheItem.getResource()))) {
+            if (tokenCacheItem!=null && tokenCacheItem.getAuthority()!=null &&
+                    tokenCacheItem.getAuthority().equalsIgnoreCase(mAuthority) &&
+                    tokenCacheItem.getClientId()!=null &&
+                    tokenCacheItem.getClientId().equalsIgnoreCase(clientId) &&
+                    (tokenCacheItem.getIsMultiResourceRefreshToken() ||
+                    StringExtensions.isNullOrBlank(tokenCacheItem.getResource()))) {
                 mrrtsMatchingRequest.add(tokenCacheItem);
             }
         }