From ab96460853b0aa98027a9fb03d879c265f2d77a1 Mon Sep 17 00:00:00 2001
From: MeFisto94 <MeFisto94@users.noreply.github.com>
Date: Wed, 12 Feb 2020 19:48:46 +0100
Subject: [PATCH] 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
---
 .../src/main/java/com/jme3/asset/ImplHandler.java     | 11 +++--------
 .../src/main/java/com/jme3/system/JmeVersion.java     |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java
index 581c18b4e..ca7fe2381 100644
--- a/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java
+++ b/jme3-core/src/main/java/com/jme3/asset/ImplHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012 jMonkeyEngine
+ * Copyright (c) 2009-2020 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,16 +120,11 @@ final class ImplHandler {
                     ((AssetLocator)obj).setRootPath(path);
                 }
                 return obj;
-            } catch (InstantiationException ex) {
+            } catch (InstantiationException | IllegalAccessException ex) {
                 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());
                 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;
         }
diff --git a/jme3-core/src/main/java/com/jme3/system/JmeVersion.java b/jme3-core/src/main/java/com/jme3/system/JmeVersion.java
index 0492df950..04586034b 100644
--- a/jme3-core/src/main/java/com/jme3/system/JmeVersion.java
+++ b/jme3-core/src/main/java/com/jme3/system/JmeVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2015 jMonkeyEngine
+ * Copyright (c) 2009-2020 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ public class JmeVersion {
     static {
         try {
             props.load(JmeVersion.class.getResourceAsStream("version.properties"));
-        } catch (IOException ex) {
+        } catch (IOException | NullPointerException ex) {
             logger.log(Level.WARNING, "Unable to read version info!", ex);
         }
     }