Skip to content

Commit 584a2aa

Browse files
committed
Merge branch 'pedroro/empty-list-browser-safe-list' of https://github.com/AzureAD/microsoft-authentication-library-common-for-android into fadi/oom-handle
2 parents c756cac + 09e7137 commit 584a2aa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/InteractiveTokenCommandParameters.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.microsoft.identity.common.java.ui.PreferredAuthMethod;
3030

3131
import java.util.ArrayList;
32+
import java.util.Collections;
3233
import java.util.HashMap;
3334
import java.util.List;
3435
import java.util.Map;
@@ -95,6 +96,6 @@ public List<String> getExtraScopesToConsent() {
9596
}
9697

9798
public List<BrowserDescriptor> getBrowserSafeList() {
98-
return this.browserSafeList == null ? null : new ArrayList<>(this.browserSafeList);
99+
return this.browserSafeList == null ? Collections.emptyList() : new ArrayList<>(this.browserSafeList);
99100
}
100101
}

0 commit comments

Comments
 (0)