Fix small things (#1287)
* JmeVersion: Don't throw a NullPointerException when version.properties can't be found. * ImplHandler: Reduce Code-Duplication by using a multi-catch statement
This commit is contained in:
parent
f268d00222
commit
ab96460853
jme3-core/src/main/java/com/jme3
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2009-2012 jMonkeyEngine
|
* Copyright (c) 2009-2020 jMonkeyEngine
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -120,16 +120,11 @@ final class ImplHandler {
|
|||||||
((AssetLocator)obj).setRootPath(path);
|
((AssetLocator)obj).setRootPath(path);
|
||||||
}
|
}
|
||||||
return obj;
|
return obj;
|
||||||
} catch (InstantiationException ex) {
|
} catch (InstantiationException | IllegalAccessException ex) {
|
||||||
logger.log(Level.SEVERE,"Cannot create locator of type {0}, does"
|
logger.log(Level.SEVERE,"Cannot create locator of type {0}, does"
|
||||||
+ " the class have an empty and publically accessible"+
|
+ " the class have an empty and publicly accessible"+
|
||||||
" constructor?", type.getName());
|
" constructor?", type.getName());
|
||||||
logger.throwing(type.getName(), "<init>", ex);
|
logger.throwing(type.getName(), "<init>", ex);
|
||||||
} catch (IllegalAccessException ex) {
|
|
||||||
logger.log(Level.SEVERE,"Cannot create locator of type {0}, "
|
|
||||||
+ "does the class have an empty and publically "
|
|
||||||
+ "accessible constructor?", type.getName());
|
|
||||||
logger.throwing(type.getName(), "<init>", ex);
|
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2009-2015 jMonkeyEngine
|
* Copyright (c) 2009-2020 jMonkeyEngine
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
@ -49,7 +49,7 @@ public class JmeVersion {
|
|||||||
static {
|
static {
|
||||||
try {
|
try {
|
||||||
props.load(JmeVersion.class.getResourceAsStream("version.properties"));
|
props.load(JmeVersion.class.getResourceAsStream("version.properties"));
|
||||||
} catch (IOException ex) {
|
} catch (IOException | NullPointerException ex) {
|
||||||
logger.log(Level.WARNING, "Unable to read version info!", ex);
|
logger.log(Level.WARNING, "Unable to read version info!", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user