initNews NPE fix

Adds some null checking and modifies the handling of newly created
newsSets.

Author: Naenyn

src/main/java/org/jasig/portlet/newsreader/dao/HibernateNewsStore.java

@@ -173,11 +173,15 @@ public List<PredefinedNewsDefinition> getHiddenPredefinedNewsDefinitions(Long se
     /** {@inheritDoc} */
     public void initNews(NewsSet set, Set<String> roles) {
         try {
+            if (set == null) {
+                logger.warn("Null NewsSet passed to initNews method");
+                return;
+            }
 
             // if the user doesn't have any roles, we don't have any
             // chance of getting predefined news, so just go ahead
             // and return
-            if (roles.isEmpty())
+            if (roles == null || roles.isEmpty())
                 return;
 
             String query = "FROM PredefinedNewsDefinition def "
@@ -356,6 +360,10 @@ public List<NewsSet> getNewsSetsForUser(String userId) {
     })
 	public void storeNewsSet(NewsSet set) {
         try {
+            if (set == null) {
+                logger.warn("Null NewsSet passed to storeNewsSet method");
+                return;
+            }
 
             getHibernateTemplate().saveOrUpdate(set);
             getHibernateTemplate().flush();

src/main/java/org/jasig/portlet/newsreader/mvc/portlet/reader/AjaxNewsController.java

@@ -124,6 +124,11 @@ public ModelAndView getJSONFeeds(ResourceRequest request, ResourceResponse respo
 
         String setName = request.getPreferences().getValue("newsSetName", "default");
         NewsSet set = setCreationService.getNewsSet(setName, request);
+        if (set == null) {
+            log.warn("Unable to retrieve NewsSet for setName={}", setName);
+            model.put("message", "Unable to load news feeds. Please try again later.");
+            return new ModelAndView("json", model);
+        }
         final List<NewsConfiguration> feeds = AbstractNewsController.filterNonWhitelistedConfigurations(request, set.getNewsConfigurations());
         Collections.sort(feeds);
 

src/main/java/org/jasig/portlet/newsreader/service/SharedNewsSetServiceImpl.java

@@ -68,12 +68,20 @@ public void setNewsStore(NewsStore newsStore) {
 	 */
 	/** {@inheritDoc} */
 	public NewsSet getNewsSet(String fname, PortletRequest request) {
+		if (request == null) {
+			logger.warn("Null PortletRequest passed to getNewsSet method");
+			return null;
+		}
 
 		final PortletSession session = request.getPortletSession();
 
 		// get the user id associated with the current user, or use the configured
 		// guest username if no user is authenticated
 		final String userId = userIdService.getUserId(request);
+		if (userId == null) {
+			logger.warn("Unable to determine userId from request");
+			return null;
+		}
 
 		NewsSet set;
 
@@ -88,19 +96,30 @@ public NewsSet getNewsSet(String fname, PortletRequest request) {
 		        set = new NewsSet();
 		        set.setUserId(userId);
 		        set.setName(fname);
-		        newsStore.storeNewsSet(set);
-				//TODO: the persisted set (line above) isn't always available to the line below. Hibernate being lazy?
-				set = newsStore.getNewsSet(userId, fname); // get set_id
+		        
+		        try {
+		            newsStore.storeNewsSet(set);
+		            
+		            if (set.getId() == null) {
+		                logger.warn("NewsSet was saved but no ID was generated for userId={}, fname={}", userId, fname);
+		                NewsSet retrievedSet = newsStore.getNewsSet(userId, fname);
+		                if (retrievedSet != null) {
+		                    set = retrievedSet;
+		                } else {
+		                    logger.error("Failed to create or retrieve NewsSet for userId={}, fname={}", userId, fname);
+		                    return null;
+		                }
+		            }
+		        } catch (Exception e) {
+		            logger.error("Error creating NewsSet for userId={}, fname={}: {}", userId, fname, e.getMessage());
+		            return null;
+		        }
 			}
 
 			// Persistent set is now loaded but may still need re-initalising since last use.
 			// by adding setId to session, we signal that initialisation has taken place.
 			if (session.getAttribute("setId", PortletSession.PORTLET_SCOPE) == null) {
-				if (set != null) {
-					logger.debug("re-initalising loaded newsSet " + set.getName());
-				} else {
-					logger.debug("attempting to re-initialize loaded newsSet, but it is null");
-				}
+				logger.debug("re-initalising loaded newsSet " + set.getName());
 
 				@SuppressWarnings("unchecked")
 				final Set<String> roles = rolesService.getUserRoles(request);