[tomee] branch tomee-9.x updated: TOMEE-4192 - ApplicationComposers do not clear GC references on release (#1032)

[rz...@apache.org]

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

rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-9.x by this push:
     new d81e6b6aef TOMEE-4192 - ApplicationComposers do not clear GC references on release  (#1032)
d81e6b6aef is described below

commit d81e6b6aef31475056aa3d8f1ac5f20f69489ff4
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Tue Apr 4 19:56:24 2023 +0200

    TOMEE-4192 - ApplicationComposers do not clear GC references on release  (#1032)
    
    * TOMEE-4192 ApplicationComposers do not clear GC references on release
    
    * move cleanup code to shared api and add null check to prevent NPE in
    case of legacy junit rules.
    
    ---------
    
    Co-authored-by: G-Ork <ts...@gmail.com>
---
 .../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 75371114ad..033e760a7e 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..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());
+    }
+}