You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2022/04/21 22:28:28 UTC
[tomee] branch tomee-7.1.x updated: TOMEE-2919 : Fix for ConcurrentModificationException error deploying ear in TomEE Plus 7.1.2 or above
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
new d24dd25937 TOMEE-2919 : Fix for ConcurrentModificationException error deploying ear in TomEE Plus 7.1.2 or above
new 8126a59897 Merge pull request #868 from gnarayan1/tomee-7.1.x
d24dd25937 is described below
commit d24dd25937f13bff6976c5783d4d97c1fd24fa7e
Author: Geeth Narayanan <ge...@corp.trizetto.com>
AuthorDate: Thu Apr 21 17:08:47 2022 -0500
TOMEE-2919 : Fix for ConcurrentModificationException error deploying ear in TomEE Plus 7.1.2 or above
---
.../main/java/org/apache/openejb/assembler/classic/Assembler.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 8112dde5e6..c9c1532bd1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -824,11 +824,9 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
final AppContext appContext = new AppContext(appInfo.appId, SystemInstance.get(), classLoader, globalJndiContext, appJndiContext, appInfo.standaloneModule);
- appContext.getProperties().putAll(appInfo.properties);
-
- for (final Entry<Object, Object> entry : appContext.getProperties().entrySet()) {
- if (Module.class.isInstance(entry.getValue())) {
- appContext.getProperties().remove(entry.getKey());
+ for (final Entry<Object, Object> entry : appInfo.properties.entrySet()) {
+ if (! Module.class.isInstance(entry.getValue())) {
+ appContext.getProperties().put(entry.getKey(), entry.getValue());
}
}