Author: markt Date: Wed Jan 25 20:13:22 2017 New Revision: 1780265 URL: http://svn.apache.org/viewvc?rev=1780265&view=rev Log: Remove the Java 8 specific code
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1780265&r1=1780264&r2=1780265&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed Jan 25 20:13:22 2017 @@ -243,7 +243,6 @@ public class DefaultInstanceManager impl } - @Override public void backgroundProcess() { annotationCache.maintain(); } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1780265&r1=1780264&r2=1780265&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jan 25 20:13:22 2017 @@ -5569,9 +5569,9 @@ public class StandardContext extends Con } } InstanceManager instanceManager = getInstanceManager(); - if (instanceManager != null) { + if (instanceManager instanceof DefaultInstanceManager) { try { - instanceManager.backgroundProcess(); + ((DefaultInstanceManager)instanceManager).backgroundProcess(); } catch (Exception e) { log.warn(sm.getString( "standardContext.backgroundProcess.instanceManager", Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java?rev=1780265&r1=1780264&r2=1780265&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/InstanceManager.java Wed Jan 25 20:13:22 2017 @@ -39,13 +39,4 @@ public interface InstanceManager { public void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException; - - /** - * Called by the component using the InstanceManager periodically to perform - * any regular maintenance that might be required. By default, this method - * is a NO-OP. - */ - public default void backgroundProcess() { - // NO-OP by default - } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org