Adding null checks for InstrHttpInputStream/InstrHttpOutputStream

Author: raymondlam

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrURLConnectionBase.java

@@ -140,7 +140,12 @@ public InputStream getInputStream() throws IOException {
 
     try {
       final InputStream inputStream = httpUrlConnection.getInputStream();
-      return new InstrHttpInputStream(inputStream, networkMetricBuilder, timer);
+      // Make sure we don't pass in a null into InstrHttpInputStream, since InstrHttpInputStream is
+      // not null-safe.
+      if (inputStream != null) {
+        return new InstrHttpInputStream(inputStream, networkMetricBuilder, timer);
+      }
+      return null;
     } catch (final IOException e) {
       networkMetricBuilder.setTimeToResponseCompletedMicros(timer.getDurationMicros());
       NetworkRequestMetricBuilderUtil.logError(networkMetricBuilder);
@@ -156,8 +161,13 @@ public long getLastModified() {
 
   public OutputStream getOutputStream() throws IOException {
     try {
-      return new InstrHttpOutputStream(
-          httpUrlConnection.getOutputStream(), networkMetricBuilder, timer);
+      final OutputStream outputStream = httpUrlConnection.getOutputStream();
+      // Make sure we don't pass in a null into InstrHttpOutputStream, since InstrHttpOutputStream
+      // is not null-safe.
+      if (outputStream != null) {
+        return new InstrHttpOutputStream(outputStream, networkMetricBuilder, timer);
+      }
+      return null;
     } catch (final IOException e) {
       networkMetricBuilder.setTimeToResponseCompletedMicros(timer.getDurationMicros());
       NetworkRequestMetricBuilderUtil.logError(networkMetricBuilder);

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java

@@ -107,6 +107,15 @@ public void testGetInputStreamThrowsIOException() throws IOException {
     assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000);
   }
 
+  @Test
+  public void testGetInputStreamWithNullInputStreamReturnsNull() throws IOException {
+    HttpURLConnection urlConnection = mockHttpUrlConnection();
+    when(urlConnection.getInputStream()).thenReturn(null);
+    assertThat(
+            new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder).getInputStream())
+        .isNull();
+  }
+
   @Test
   public void testGetOutputStreamThrowsIOException() throws IOException {
     HttpURLConnection urlConnection = mockHttpUrlConnection();
@@ -122,6 +131,16 @@ public void testGetOutputStreamThrowsIOException() throws IOException {
     assertThat(metric.getTimeToResponseCompletedUs()).isEqualTo(2000);
   }
 
+  @Test
+  public void testGetOutputStreamWithNullOuputStreamReturnsNull() throws IOException {
+    HttpURLConnection urlConnection = mockHttpUrlConnection();
+    when(urlConnection.getOutputStream()).thenReturn(null);
+    assertThat(
+            new InstrURLConnectionBase(urlConnection, timer, networkMetricBuilder)
+                .getOutputStream())
+        .isNull();
+  }
+
   @Test
   public void testGetPermissionThrowsIOException() throws IOException {
     HttpURLConnection urlConnection = mockHttpUrlConnection();