View | Details | Raw Unified | Return to bug 54906
Collapse All | Expand All

(-)a/java/org/apache/catalina/loader/WebappClassLoader.java (-5 / +11 lines)
Lines 41-46 import java.security.PrivilegedAction; Link Here
41
import java.security.ProtectionDomain;
41
import java.security.ProtectionDomain;
42
import java.util.ArrayList;
42
import java.util.ArrayList;
43
import java.util.Collection;
43
import java.util.Collection;
44
import java.util.ConcurrentModificationException;
44
import java.util.Enumeration;
45
import java.util.Enumeration;
45
import java.util.HashMap;
46
import java.util.HashMap;
46
import java.util.Iterator;
47
import java.util.Iterator;
Lines 2312-2322 public class WebappClassLoader Link Here
2312
2313
2313
        if (o instanceof Collection<?>) {
2314
        if (o instanceof Collection<?>) {
2314
            Iterator<?> iter = ((Collection<?>) o).iterator();
2315
            Iterator<?> iter = ((Collection<?>) o).iterator();
2315
            while (iter.hasNext()) {
2316
            try {
2316
                Object entry = iter.next();
2317
                while (iter.hasNext()) {
2317
                if (loadedByThisOrChild(entry)) {
2318
                    Object entry = iter.next();
2318
                    return true;
2319
                    if (loadedByThisOrChild(entry)) {
2320
                        return true;
2321
                    }
2319
                }
2322
                }
2323
            } catch (ConcurrentModificationException e) {
2324
                log.warn(sm.getString(
2325
                         "webappClassLoader.checkThreadLocalsForLeaksFail",
2326
                         getContextName()), e);
2320
            }
2327
            }
2321
        }
2328
        }
2322
        return false;
2329
        return false;
2323
- 

Return to bug 54906