[tomee] branch TOMEE-4192-8.x created (now 92bab34831)

[rz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a change to branch TOMEE-4192-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


      at 92bab34831 TOMEE-4192 ApplicationComposers do not clear GC references on release

This branch includes the following new commits:

     new 92bab34831 TOMEE-4192 ApplicationComposers do not clear GC references on release

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[tomee] 01/01: TOMEE-4192 ApplicationComposers do not clear GC references on release

[rz...@apache.org]

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 92bab34831655cd1699eea351054e451c7f36dd3
Author: G-Ork <ts...@gmail.com>
AuthorDate: Sun Mar 19 13:32:38 2023 +0100

    TOMEE-4192 ApplicationComposers do not clear GC references on release
---
 .../openejb/testing/ApplicationComposers.java      |  7 ++
 .../junit5/AppComposerMemoryReleaseTest.java       | 74 ++++++++++++++++++++++
 2 files changed, 81 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..568bfe292b 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,13 @@ public class ApplicationComposers {
             }
 
             OpenEJB.destroy();
+            SystemInstance.reset();
+            /*
+            * Clear additional references
+            */
+            appContext.getWebContexts().clear();
+            appContext.getInjections().clear();
+            appContext.getSystemInstance().removeComponent(TestInstance.class);
         } finally {
             runAll(afterRunnables);
             if (originalLoader != null) {
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..b5d8bb51fc
--- /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 jakarta.enterprise.context.ApplicationScoped;
+import jakarta.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());
+    }
+}