This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch TOMEE-4192-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 72f67b64f0128a8b0d7962c35dac8c17fc95e7b6 Author: G-Ork <[email protected]> AuthorDate: Sun Mar 19 13:32:38 2023 +0100 TOMEE-4192 ApplicationComposers do not clear GC references on release --- .../openejb/testing/ApplicationComposers.java | 11 ++++ .../junit5/AppComposerMemoryReleaseTest.java | 74 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java index a915654e80..ef56512c81 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java @@ -1105,6 +1105,8 @@ public class ApplicationComposers { } OpenEJB.destroy(); + SystemInstance.reset(); + } finally { runAll(afterRunnables); if (originalLoader != null) { @@ -1151,6 +1153,15 @@ public class ApplicationComposers { // no-op } } + + /* + * Clear additional references + */ + if (appContext != null) { + appContext.getWebContexts().clear(); + appContext.getInjections().clear(); + appContext.getSystemInstance().removeComponent(TestInstance.class); + } } private void runAll(final Collection<Runnable> runnables) { diff --git a/container/openejb-junit5/src/test/java/org/apache/openejb/junit5/AppComposerMemoryReleaseTest.java b/container/openejb-junit5/src/test/java/org/apache/openejb/junit5/AppComposerMemoryReleaseTest.java new file mode 100644 index 0000000000..67eb5a1657 --- /dev/null +++ b/container/openejb-junit5/src/test/java/org/apache/openejb/junit5/AppComposerMemoryReleaseTest.java @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.junit5; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.Serializable; +import java.util.Arrays; + +import org.apache.openejb.jee.WebApp; +import org.apache.openejb.testing.Classes; +import org.apache.openejb.testing.Module; +import org.junit.jupiter.api.Test; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; + +@RunWithApplicationComposer +public class AppComposerMemoryReleaseTest { + + @Module + @Classes(innerClassesAsBean = true, cdi = true) + public WebApp web() { + return new WebApp(); + } + + @Inject + private MemoryPayloadBean memoryPayloadBean; + + /* + * Bean producing high memory payload easy to locate + * by retained size or classname in heapdump. + */ + @ApplicationScoped + public static class MemoryPayloadBean implements Serializable { + private static final long serialVersionUID = -5814319377355637770L; + private static final int PAYLOAD_SIZE = 1024 * 1024 * 16; + private String payload; + + public MemoryPayloadBean() { + super(); + /* + * Big Memory Payload + */ + char[] array = new char[PAYLOAD_SIZE]; + Arrays.fill(array, '@'); + this.payload = new String(array); + } + + public String getPayload() { + return this.payload; + } + } + + @Test + public void run() { + assertNotNull(memoryPayloadBean); + assertNotNull(memoryPayloadBean.getPayload()); + } +}
