Author: ggregory
Date: Sat Oct  6 14:38:28 2018
New Revision: 1843015

URL: http://svn.apache.org/viewvc?rev=1843015&view=rev
Log:
[BEANUTILS-509] WeakHashmap enters into infinite loop in WrapDynaClass.java. 
Comment and always shutdown executor in a finally clause.

Modified:
    
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java

Modified: 
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java?rev=1843015&r1=1843014&r2=1843015&view=diff
==============================================================================
--- 
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
 Sat Oct  6 14:38:28 2018
@@ -40,7 +40,7 @@ import org.junit.Test;
  * The bug causes an infinite loop in WeakHashMap.get which was not accessed 
in a thread safe manner. This originates
  * with WrapDynaClass.createDynaClass().
  */
-@Ignore("https://issues.apache.org/jira/browse/BEANUTILS-509; always fails 
with a JUnit test timeout; with or without the change applied to 
WrapDynaClass.")
+@Ignore("https://issues.apache.org/jira/browse/BEANUTILS-509.";)
 public class Jira509TestCase {
 
     protected int random(final int max) {
@@ -56,6 +56,7 @@ public class Jira509TestCase {
         final List<Class<?>> classList = Arrays.asList(Map.class, 
HashMap.class, Collections.class, Arrays.class,
                 Collection.class, Set.class, ArrayList.class, List.class, 
HashSet.class);
 
+        // All daemon threads.
         final ExecutorService executor = Executors.newFixedThreadPool(100, new 
ThreadFactory() {
 
             @Override
@@ -66,22 +67,25 @@ public class Jira509TestCase {
             }
         });
 
-        for (int i = 1; i < 100_000_000; i++) {
-            executor.submit(new Runnable() {
-                Class<?> c = classList.get(random(classList.size()));
-
-                @Override
-                public void run() {
-                    final WrapDynaClass w = WrapDynaClass.createDynaClass(c);
-                    assert w != null;
-                }
+        try {
+            // Loop _may_ hang without fix.
+            for (int i = 1; i < 10_000_000; i++) {
+                executor.submit(new Runnable() {
+                    Class<?> clazz = classList.get(random(classList.size()));
+
+                    @Override
+                    public void run() {
+                        final WrapDynaClass w = 
WrapDynaClass.createDynaClass(clazz);
+                        assert w != null;
+                    }
 
-            });
-        }
-
-        executor.shutdown();
-        executor.awaitTermination(3500, TimeUnit.MILLISECONDS);
+                });
+            }
+        } finally {
+            executor.shutdown();
+            executor.awaitTermination(3500, TimeUnit.MILLISECONDS);
 
+        }
     }
 
 }
\ No newline at end of file


Reply via email to