Author: markt Date: Mon Feb 2 10:06:59 2015 New Revision: 1656433 URL: http://svn.apache.org/r1656433 Log: Fix AJP - broken by recent refactoring
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1656433&r1=1656432&r2=1656433&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Feb 2 10:06:59 2015 @@ -837,9 +837,11 @@ public class AjpProcessor extends Abstra @Override public void setSslSupport(SSLSupport sslSupport) { - // Should never reach this code but in case we do... - throw new IllegalStateException( - sm.getString("ajpprocessor.ssl.notsupported")); + if (sslSupport != null) { + // Should never reach this code but in case we do... + throw new IllegalStateException( + sm.getString("ajpprocessor.ssl.notsupported")); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org