Index: src/main/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializer.java =================================================================== --- src/main/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializer.java (revision 1520065) +++ src/main/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializer.java (working copy) @@ -34,7 +34,7 @@ @Override public void onStartup(final Set> classes, final ServletContext servletContext) throws ServletException { - if (servletContext.getMajorVersion() > 2) { + if (servletContext.getEffectiveMajorVersion() > 2) { servletContext.log("Log4jServletContainerInitializer starting up Log4j in Servlet 3.0+ environment."); final Log4jWebInitializer initializer = Log4jWebInitializerImpl.getLog4jWebInitializer(servletContext); Index: src/test/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializerTest.java =================================================================== --- src/test/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializerTest.java (revision 1520065) +++ src/test/java/org/apache/logging/log4j/core/web/Log4jServletContainerInitializerTest.java (working copy) @@ -53,7 +53,7 @@ @Test public void testOnStartupWithServletVersion2_x() throws Exception { - expect(this.servletContext.getMajorVersion()).andReturn(2); + expect(this.servletContext.getEffectiveMajorVersion()).andReturn(2); replay(this.servletContext, this.initializer); @@ -67,7 +67,7 @@ final Capture listenerCapture = new Capture(); final Capture filterCapture = new Capture(); - expect(this.servletContext.getMajorVersion()).andReturn(3); + expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); this.servletContext.log(anyObject(String.class)); expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebInitializer.INITIALIZER_ATTRIBUTE)).andReturn(this.initializer); @@ -93,7 +93,7 @@ final Capture listenerCapture = new Capture(); final Capture filterCapture = new Capture(); - expect(this.servletContext.getMajorVersion()).andReturn(3); + expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); this.servletContext.log(anyObject(String.class)); expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebInitializer.INITIALIZER_ATTRIBUTE)).andReturn(this.initializer); @@ -122,7 +122,7 @@ public void testOnStartupFailedDueToInitializerFailure() throws Exception { final UnavailableException exception = new UnavailableException(""); - expect(this.servletContext.getMajorVersion()).andReturn(3); + expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); this.servletContext.log(anyObject(String.class)); expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebInitializer.INITIALIZER_ATTRIBUTE)).andReturn(this.initializer);