This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new 1784728b Make WrapDynaClass instance cache thread-safe (#418)
1784728b is described below
commit 1784728b54b5f152d703e7c5bd618ceaed193584
Author: Naveed Khan <[email protected]>
AuthorDate: Wed Jul 15 14:19:22 2026 +0000
Make WrapDynaClass instance cache thread-safe (#418)
* make WrapDynaClass instance cache thread-safe
* add concurrency regression test for WrapDynaClass cache
Signed-off-by: Naveed Khan <[email protected]>
---------
Signed-off-by: Naveed Khan <[email protected]>
---
.../apache/commons/beanutils2/WrapDynaClass.java | 3 +-
.../commons/beanutils2/WrapDynaClassTest.java | 102 +++++++++++++++++++++
2 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index 7f22443e..a609e91a 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -23,7 +23,6 @@ import java.lang.ref.SoftReference;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.WeakHashMap;
/**
* Implements {@link DynaClass} to wrap standard JavaBean instances.
@@ -88,7 +87,7 @@ public class WrapDynaClass implements DynaClass {
private static final ContextClassLoaderLocal<Map<CacheKey, WrapDynaClass>>
CLASSLOADER_CACHE = new ContextClassLoaderLocal<Map<CacheKey, WrapDynaClass>>()
{
@Override
protected Map<CacheKey, WrapDynaClass> initialValue() {
- return new WeakHashMap<>();
+ return BeanUtils.createCache();
}
};
diff --git a/src/test/java/org/apache/commons/beanutils2/WrapDynaClassTest.java
b/src/test/java/org/apache/commons/beanutils2/WrapDynaClassTest.java
new file mode 100644
index 00000000..4b9d3038
--- /dev/null
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaClassTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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
+ *
+ * https://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.commons.beanutils2;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Set;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link WrapDynaClass}.
+ */
+class WrapDynaClassTest {
+
+ /**
+ * The cache key is one bean class, so {@code createDynaClass} must hand
back a single instance no matter how many threads race to populate the
+ * per-classloader cache. With a plain {@code WeakHashMap} the non-atomic
{@code computeIfAbsent} let concurrent callers build and return distinct
+ * instances for one key; this drives that race and fails if more than one
instance escapes.
+ */
+ @Test
+ void testConcurrentCreateDynaClassReturnsSameInstance() throws Exception {
+ final int threads = 16;
+ final int rounds = 200;
+ final ExecutorService pool = Executors.newFixedThreadPool(threads);
+ try {
+ for (int r = 0; r < rounds; r++) {
+ WrapDynaClass.clear();
+ final CyclicBarrier barrier = new CyclicBarrier(threads);
+ final Set<WrapDynaClass> results =
Collections.newSetFromMap(new IdentityHashMap<>());
+ final Future<?>[] futures = new Future<?>[threads];
+ for (int t = 0; t < threads; t++) {
+ futures[t] = pool.submit(() -> {
+ barrier.await();
+ final WrapDynaClass wdc =
WrapDynaClass.createDynaClass(ConcurrentBean.class);
+ synchronized (results) {
+ results.add(wdc);
+ }
+ return null;
+ });
+ }
+ for (final Future<?> f : futures) {
+ f.get();
+ }
+ assertEquals(1, results.size(), "createDynaClass returned more
than one instance for one key");
+ }
+ } finally {
+ pool.shutdownNow();
+ pool.awaitTermination(10, TimeUnit.SECONDS);
+ }
+ }
+
+ /**
+ * The single-threaded cache contract: repeated calls for one bean class
return the same instance until the cache is cleared.
+ */
+ @Test
+ void testCreateDynaClassIsCached() {
+ WrapDynaClass.clear();
+ final WrapDynaClass first =
WrapDynaClass.createDynaClass(ConcurrentBean.class);
+ assertSame(first, WrapDynaClass.createDynaClass(ConcurrentBean.class));
+ WrapDynaClass.clear();
+ }
+
+ /**
+ * Simple bean used as a cache key.
+ */
+ public static final class ConcurrentBean {
+
+ private String value;
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(final String value) {
+ this.value = value;
+ }
+ }
+}
