SAK-30361 user membership bulk change status needs more exception han…

…dling code
OTEMA · Feb 23, 2016 · 815c65e · 815c65e
1 parent ced81ad
commit 815c65e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/usermembership/tool/src/java/org/sakaiproject/umem/tool/ui/SiteListBean.java b/usermembership/tool/src/java/org/sakaiproject/umem/tool/ui/SiteListBean.java
@@ -42,7 +42,6 @@
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
-import org.apache.commons.lang.StringUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -669,6 +668,14 @@ private void toggleUserStatusInSites( boolean active )
 					{
 						LOG.warn( "permission exception updating realm, id=" + realmID, ex );
 					}
+					catch( NullPointerException ex )
+					{
+						LOG.warn( "could not retieve user (" + userId + ") or user's role from site (" + site.getId() + ")", ex );
+					}
+					catch( Exception ex )
+					{
+						LOG.error( "unexpected error occurred, user=" + userId + ", site=" + site.getId(), ex );
+					}
 				}
 			}
 		}