[Java] Reduce the number of exceptions when loading properties files.

rtvt123 · Aug 24, 2017 · 0522197 · 0522197
1 parent ddb2f39
commit 0522197
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java b/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java
@@ -79,20 +79,28 @@ public static void loadPropertiesFile(final String filenameOrUrl)
     {
         final Properties properties = new Properties(System.getProperties());
 
-        try (InputStream in = MediaDriver.class.getClassLoader().getResourceAsStream(filenameOrUrl))
-        {
-            properties.load(in);
-        }
-        catch (final Exception ignore)
+        final URL resource = MediaDriver.class.getClassLoader().getResource(filenameOrUrl);
+        if (null != resource)
         {
+            try (InputStream in = resource.openStream())
+            {
+                properties.load(in);
+            }
+            catch (final Exception ignore)
+            {
+            }
         }
 
-        try (FileInputStream in = new FileInputStream(filenameOrUrl))
-        {
-            properties.load(in);
-        }
-        catch (final Exception ignore)
+        final File file = new File(filenameOrUrl);
+        if (file.exists())
         {
+            try (FileInputStream in = new FileInputStream(file))
+            {
+                properties.load(in);
+            }
+            catch (final Exception ignore)
+            {
+            }
         }
 
         try (InputStream in = new URL(filenameOrUrl).openStream())
@@ -130,7 +138,7 @@ public static void main(final String[] args) throws Exception
     {
         loadPropertiesFiles(args);
 
-        try (MediaDriver ignored = MediaDriver.launch())
+        try (MediaDriver ignore = MediaDriver.launch())
         {
             new ShutdownSignalBarrier().await();