Fix NPE when accept header is missing

Author: tylerjmchugh

core/src/main/java/org/fao/geonet/web/LocaleRedirects.java

@@ -44,6 +44,7 @@
 
 import java.util.*;
 
+import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -113,10 +114,14 @@ public ModelAndView redirectRootPath(final HttpServletRequest request,
                              ) throws ResourceNotFoundException {
         String lang = lang(langParam, langCookie, langHeader);
 
-        if (checkPortalExist(portal, !accept.startsWith(ACCEPT_VALUE))) {
+        // Throw exception for non-HTML requests instead of redirecting if portal is not found
+        boolean throwExceptionOnMissingPortal = accept != null && !accept.startsWith(ACCEPT_VALUE);
+
+        if (checkPortalExist(portal, throwExceptionOnMissingPortal)) {
             return redirectURL(createServiceUrl(request, _homeRedirectUrl, lang, portal));
         } else {
-            if (sourceRepository.findByType(SourceType.portal, null).size() == 0) {
+            List<Source> portals = sourceRepository.findByType(SourceType.portal, null);
+            if (portals == null || portals.isEmpty()) {
                 return redirectURL(createServiceUrl(request, _homeRedirectUrl, lang, NodeInfo.DEFAULT_NODE));
             }
             // Redirect to list of portal page if more than one or the default if only one
@@ -147,10 +152,14 @@ public ModelAndView redirectPortalPath(final HttpServletRequest request,
                                            final String langHeader) throws ResourceNotFoundException {
         String lang = lang(langParam, langCookie, langHeader);
 
-        if (checkPortalExist(portal, !accept.startsWith(ACCEPT_VALUE))) {
+        // Throw exception for non-HTML requests instead of redirecting if portal is not found
+        boolean throwExceptionOnMissingPortal = accept != null && !accept.startsWith(ACCEPT_VALUE);
+
+        if (checkPortalExist(portal, throwExceptionOnMissingPortal)) {
             return redirectURL(createServiceUrl(request, _homeRedirectUrl, lang, portal));
         } else {
-            if (sourceRepository.findByType(SourceType.subportal, null).size() == 0) {
+            List<Source> subPortals = sourceRepository.findByType(SourceType.subportal, null);
+            if (subPortals == null || subPortals.isEmpty()) {
                 return redirectURL(createServiceUrl(request, _homeRedirectUrl, lang, NodeInfo.DEFAULT_NODE));
             }
             // Redirect to list of portal page if more than one or the default if only one