Merge pull request #490 from SpectraLogic/get_system_info_fix

Fix for https://jira.spectralogic.com/browse/JSDK-245 Null Pointer exception for get system info.

Author: rpmoore

build.gradle

@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '3.5.0'
+    version = '3.5.1'
 }
 
 subprojects {

ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/PropertyUtils.java

@@ -15,7 +15,6 @@
 
 package com.spectralogic.ds3client.utils;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
@@ -47,13 +46,18 @@ public static String getSdkVersion() {
         try (final InputStream propertiesStream = PropertyUtils.class.getClassLoader().getResourceAsStream(PROPERTIES_FILE_NAME)) {
             if (propertiesStream != null) {
                 properties.load(propertiesStream);
-                final String versionFromPropFile = properties.get(SDK_VERSION_PROPERTY_NAME).toString();
-                if (!Guard.isStringNullOrEmpty(versionFromPropFile)) {
-                    versionProperty.set(versionFromPropFile);
+                final Object versionPropertyObject = properties.get(SDK_VERSION_PROPERTY_NAME);
+
+                if (versionPropertyObject != null) {
+                    final String versionFromPropFile = properties.get(SDK_VERSION_PROPERTY_NAME).toString();
+
+                    if ( ! Guard.isStringNullOrEmpty(versionFromPropFile)) {
+                        versionProperty.set(versionFromPropFile);
+                    }
                 }
             }
-        } catch (final IOException e) {
-            LOG.warn("Could not read properties file.", e);
+        } catch (final Throwable t) {
+            LOG.warn("Could not read properties file.", t);
         }
 
         return versionProperty.get();