SteamWar/ProtocolLib
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

attemptLoadFrom now ignores null values properly

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Glen Husman 2014-05-14 16:51:56 -07:00
Ursprung e0449b2db6
Commit 95087a5b9f
1 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
ProtocolLib/src/main/java/com/comphenix/protocol/utility/ClassSource.java
Datei anzeigen

@ -60,13 +60,15 @@ public abstract class ClassSource {
/** /**
* Retrieve a class source that will attempt lookups in each of the given sources in the order they are in the array, and return the first value that is found. * Retrieve a class source that will attempt lookups in each of the given sources in the order they are in the array, and return the first value that is found.
* If the sources array is empty, null, or composed of all null elements, the returned ClassSource will be null. Null elements in the array are ignored.
* @param sources - the class sources. * @param sources - the class sources.
* @return A new class source. * @return A new class source.
*/ */
public static ClassSource attemptLoadFrom(final ClassSource... sources) { public static ClassSource attemptLoadFrom(final ClassSource... sources) {
ClassSource source = sources[0]; ClassSource source = sources != null && sources.length >= 1 ? sources[0] : null;
for(int i = 1; i < sources.length; i++){ for(int i = 1; i < sources.length; i++){
source = source.retry(sources[i]); source = sources[i] == null ? source :
source == null ? sources[i] : source.retry(sources[i]);
} }
return source; return source;
} }
@ -125,7 +127,7 @@ public abstract class ClassSource {
/** /**
* Retrieve a class by name. * Retrieve a class by name.
* @param canonicalName - the full canonical name of the class. * @param canonicalName - the full canonical name of the class.
* @return The corresponding class * @return The corresponding class. If the class is not found, NULL should <b>not</b> be returned, instead a {@code ClassNotFoundException} exception should be thrown.
* @throws ClassNotFoundException If the class could not be found. * @throws ClassNotFoundException If the class could not be found.
*/ */
public abstract Class<?> loadClass(String canonicalName) throws ClassNotFoundException; public abstract Class<?> loadClass(String canonicalName) throws ClassNotFoundException;