| commit | de82d715a5ed75bef49b535b7382fe0556ab856e | [log] [tgz] |
|---|---|---|
| author | Jonathan Gallimore <jon@jrg.me.uk> | Wed Dec 11 09:56:40 2019 +0000 |
| committer | GitHub <noreply@github.com> | Wed Dec 11 09:56:40 2019 +0000 |
| tree | 931a4692020ed6838559ac79a3d40e42ff40dc4a | |
| parent | 7f7edb486d90f5e57cf839f623696f4792d1eb56 [diff] | |
| parent | 960462a8858583ad7800992022f222b9f5d25398 [diff] |
Merge pull request #621 from tandraschko/master TOMEE-2750 - Memory leak on undeploy (also contains commits about MyFaces integration)
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java index 8a5eb60..87dfd2f 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java
@@ -370,7 +370,7 @@ return webXml; } - public class OpenEJBWebXml extends WebXml { + public static class OpenEJBWebXml extends WebXml { public static final String OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY = "openejb.web.xml.major"; private final String prefix;
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProvider.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProvider.java index 4ed8b9e..3641b21 100644 --- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProvider.java +++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProvider.java
@@ -23,6 +23,7 @@ import javax.faces.context.ExternalContext; import java.io.InputStream; +// TODO remove after MYFACES-4313 / MyFaces 2.3.7 public class TomEEFacesConfigurationProvider extends DefaultFacesConfigurationProvider { @Override public FacesConfig getWebAppFacesConfig(final ExternalContext ectx) {
diff --git a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java index 1d098c5..125c5c1 100644 --- a/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java +++ b/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java
@@ -29,6 +29,7 @@ import java.util.logging.Level; import java.util.logging.Logger; +// TODO remove after MYFACES-4313 / MyFaces 2.3.7 // fork to be able to not fail on empty faces-config.xml public class TomEEFacesConfigurationProviderFactory extends DefaultFacesConfigurationProviderFactory { public static final String FACES_CONFIGURATION_PROVIDER = FacesConfigurationProvider.class.getName();