1.1 --- a/src/jdk/internal/dynalink/DynamicLinkerFactory.java Mon Feb 18 10:36:18 2013 +0100 1.2 +++ b/src/jdk/internal/dynalink/DynamicLinkerFactory.java Mon Feb 18 16:00:15 2013 +0100 1.3 @@ -102,7 +102,6 @@ 1.4 import jdk.internal.dynalink.support.LinkerServicesImpl; 1.5 import jdk.internal.dynalink.support.TypeConverterFactory; 1.6 1.7 - 1.8 /** 1.9 * A factory class for creating {@link DynamicLinker}s. The most usual dynamic linker is a linker that is a composition 1.10 * of all {@link GuardingDynamicLinker}s known and pre-created by the caller as well as any 1.11 @@ -256,14 +255,16 @@ 1.12 1.13 // Gather classes of all precreated (prioritized and fallback) linkers. 1.14 // We'll filter out any discovered linkers of the same class. 1.15 - final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses = new HashSet<>(); 1.16 + final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses = 1.17 + new HashSet<>(); 1.18 addClasses(knownLinkerClasses, prioritizedLinkers); 1.19 addClasses(knownLinkerClasses, fallbackLinkers); 1.20 1.21 final List<GuardingDynamicLinker> discovered = AutoDiscovery.loadLinkers(classLoader); 1.22 // Now, concatenate ... 1.23 - final List<GuardingDynamicLinker> linkers = new ArrayList<>(prioritizedLinkers.size() + discovered.size() 1.24 - + fallbackLinkers.size()); 1.25 + final List<GuardingDynamicLinker> linkers = 1.26 + new ArrayList<>(prioritizedLinkers.size() + discovered.size() 1.27 + + fallbackLinkers.size()); 1.28 // ... prioritized linkers, ... 1.29 linkers.addAll(prioritizedLinkers); 1.30 // ... filtered discovered linkers, ... 1.31 @@ -308,4 +309,4 @@ 1.32 knownLinkerClasses.add(linker.getClass()); 1.33 } 1.34 } 1.35 -} 1.36 \ No newline at end of file 1.37 +}