Merge pull request #266 from tbradellis/bellis/null-guard-batchdatase…

…nder-inputstream null guard, just print message
newrelic · Jan 27, 2021 · e4c47c1 · e4c47c1
2 parents e0d20c0 + a8d80e4
commit e4c47c1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/telemetry-core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java b/telemetry-core/src/main/java/com/newrelic/telemetry/transport/BatchDataSender.java
@@ -35,6 +35,7 @@ public class BatchDataSender {
 
   private static final Logger logger = LoggerFactory.getLogger(BatchDataSender.class);
   private static final String MEDIA_TYPE = "application/json; charset=utf-8";
+  private static final String UNKNOWN_VERSION = "UnknownVersion";
 
   static final String BASE_USER_AGENT_VALUE;
 
@@ -234,10 +235,14 @@ private static String readVersion() {
           BatchDataSender.class
               .getClassLoader()
               .getResourceAsStream("telemetry.sdk.version.properties");
+
+      if (in == null) {
+        return UNKNOWN_VERSION;
+      }
       return new BufferedReader(new InputStreamReader(in)).readLine().trim();
     } catch (Exception e) {
-      logger.error("Error reading version. Defaulting to 'UnknownVersion'", e);
-      return "UnknownVersion";
+      logger.error(String.format("Error reading version. Defaulting to '%s'", UNKNOWN_VERSION), e);
+      return UNKNOWN_VERSION;
     }
   }
 }