Author: markt Date: Sun Dec 14 11:59:43 2014 New Revision: 1645443 URL: http://svn.apache.org/r1645443 Log: instanceof includes a null check
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1645443&r1=1645442&r2=1645443&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sun Dec 14 11:59:43 2014 @@ -983,7 +983,7 @@ public class StandardContext extends Con Pipeline pipeline = getPipeline(); if (pipeline != null) { Valve basic = pipeline.getBasic(); - if ((basic != null) && (basic instanceof Authenticator)) + if (basic instanceof Authenticator) return (Authenticator) basic; Valve valves[] = pipeline.getValves(); for (int i = 0; i < valves.length; i++) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org