SAK-26269 LTiService.filterContent can accept nulls.

fk-snyk · Dec 15, 2015 · fb52304 · fb52304
1 parent ebcd17f
commit fb52304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java b/basiclti/basiclti-common/src/java/org/sakaiproject/basiclti/util/SakaiBLTIUtil.java
@@ -1662,10 +1662,7 @@ public static Properties getPropertiesFromPlacement(String placement_id, LTIServ
 			if ( tool == null ) return null;
 
 			// Adjust the content items based on the tool items
-			if ( tool != null || content != null )
-			{
-				ltiService.filterContent(content, tool);
-			}
+			ltiService.filterContent(content, tool);
 
 			for (String formInput : LTIService.TOOL_MODEL) {
 				Properties info = parseFormString(formInput);

diff --git a/...ti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java b/...ti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
@@ -361,11 +361,7 @@ else if ( refId.startsWith("content:") && refId.length() > 8 )
 							}
 						}
 
-						// Adjust the content items based on the tool items
-						if ( tool != null || content != null ) 
-						{
-							ltiService.filterContent(content, tool);
-						}
+						ltiService.filterContent(content, tool);
 					}
 					String splash = null;
 					if ( tool != null ) splash = (String) tool.get("splash");