SAK-32272 check for null before doing a greater than comparison (saka…

…iproject#4011)

site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java

@@ -7444,10 +7444,9 @@ else if ("cmRequest".equals(fromContext))
 				for (Iterator iInstructors = authorizerList.iterator(); iInstructors.hasNext();)
 				{
 					String instructorId = (String) iInstructors.next();
-					//If emailAuthorizer is defined to be true  or if requireAuthorizer is set
-
-					//If emailAuthrozier is true always send email, if it's unset send if requireAuthrozier is set
-					//Otherwise don't send
+					// If emailAuthorizer is defined to be true  or if requireAuthorizer is set
+					// If emailAuthorizer is true always send email, if it's unset send if requireAuthorizer is set
+					// Otherwise don't send
 					if (("".equals(emailAuthorizer) && requireAuthorizer) || "true".equals(emailAuthorizer))
 					{
 						// 1. email to course site authorizer

site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm

@@ -107,7 +107,7 @@
 				  	<!-- use dropdown list to select from coursemanagement service provided options -->
 					  <input type=hidden name="cmLevelChanged" id="cmLevelChanged" value="false" />
 					  <input type=hidden name="cmChangedLevel" id="cmChangedLevel" value="-1" />
-					  #if ($i == 0 || $i < $cmLevelSelections.size() + 1)
+					  #if ($i == 0 || ($cmLevelSelections && $i < $cmLevelSelections.size() + 1))
 						  <select name="$fieldName" id="id-$fieldName" 
 						  	#if ($i == $maxSelectionDepth) 
 						  		onchange="blur();document.findCourseForm.submit();" multiple 
@@ -118,8 +118,8 @@
 					  	  <select name="$fieldName" disabled="true" id="id$fieldName" >
 					  #end
 					  <option value="">$tlang.getString("nscourse.findCourse.select")</option>
-						#if ($i < $cmLevelOptions.size())
-						    #if ($i < $cmLevelSelections.size())
+						#if ($cmLevelOptions && $i < $cmLevelOptions.size())
+						    #if ($cmLevelSelections && $i < $cmLevelSelections.size())
 								#set ($selectedItem = $cmLevelSelections.get($i))
 						    #end
 	                        #foreach ($coursething in $cmLevelOptions.get($i))