diff -Nru mojarra-2.2.13/jsf-api/src/main/java/javax/faces/FactoryFinderInstance.java mojarra-2.2.13.InjectionProvider/jsf-api/src/main/java/javax/faces/FactoryFinderInstance.java --- mojarra-2.2.13/jsf-api/src/main/java/javax/faces/FactoryFinderInstance.java 2016-02-04 03:54:54.000000000 +0100 +++ mojarra-2.2.13.InjectionProvider/jsf-api/src/main/java/javax/faces/FactoryFinderInstance.java 2016-09-30 16:33:55.327278523 +0200 @@ -41,7 +41,7 @@ package javax.faces; -import com.sun.faces.spi.InjectionProvider; +//import com.sun.faces.spi.InjectionProvider; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -168,7 +168,7 @@ } private void copyInjectionProviderFromFacesContext() { - InjectionProvider injectionProvider = null; + /*InjectionProvider injectionProvider = null; FacesContext context = FacesContext.getCurrentInstance(); if (null != context) { injectionProvider = (InjectionProvider) context.getAttributes().get("com.sun.faces.config.ConfigManager_INJECTION_PROVIDER_TASK"); @@ -179,7 +179,7 @@ if (LOGGER.isLoggable(Level.SEVERE)) { LOGGER.log(Level.SEVERE, "Unable to obtain InjectionProvider from init time FacesContext. Does this container implement the Mojarra Injection SPI?"); } - } + }*/ } /** @@ -408,7 +408,7 @@ } } - if (null != result) { + /*if (null != result) { InjectionProvider provider = getInjectionProvider(); if (null != provider) { try { @@ -423,7 +423,7 @@ LOGGER.log(Level.SEVERE, "Unable to inject {0} because no InjectionProvider can be found. Does this container implement the Mojarra Injection SPI?", result); } } - } + }*/ return result; @@ -459,7 +459,7 @@ } void releaseFactories() { - InjectionProvider provider = getInjectionProvider(); + /*InjectionProvider provider = getInjectionProvider(); if (null != provider) { lock.writeLock().lock(); try { @@ -491,13 +491,13 @@ if (LOGGER.isLoggable(Level.SEVERE)) { LOGGER.log(Level.SEVERE, "Unable to call @PreDestroy annotated methods because no InjectionProvider can be found. Does this container implement the Mojarra Injection SPI?"); } - } + }*/ } - InjectionProvider getInjectionProvider() { + /*InjectionProvider getInjectionProvider() { InjectionProvider result = (InjectionProvider) factories.get(INJECTION_PROVIDER_KEY); return result; - } + }*/ void clearInjectionProvider() { factories.remove(INJECTION_PROVIDER_KEY);