Merge branch 'dev' into dev-flex

Author: br648

src/main/java/com/conveyal/datatools/manager/models/FeedSource.java

@@ -36,6 +36,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -241,11 +242,12 @@ public FeedVersion fetch (MonitorableJob.Status status, String optionalUrlOverri
             conn.connect();
             return processFetchResponse(status, optionalUrlOverride, version, latest, new HttpURLConnectionResponse(conn));
         } catch (IOException e) {
-            String message = String.format("Unable to connect to %s; not fetching %s feed", conn.getURL(), this.name); // url, this.name);
-            LOG.error(message);
+            String message = String.format("Unable to connect to %s; not fetching %s feed", conn.getURL(), this.name);
+            LOG.error(message, e);
             status.fail(message);
-            e.printStackTrace();
             return null;
+        } finally {
+            conn.disconnect();
         }
     }
 
@@ -331,7 +333,9 @@ public FeedVersion processFetchResponse(
                     status.update(message, 75.0);
                     // Create new file from input stream (this also handles hashing the file and other version fields
                     // calculated from the GTFS file.
-                    newGtfsFile = version.newGtfsFile(response.getInputStream());
+                    try (InputStream inputStream = response.getInputStream()) {
+                        newGtfsFile = version.newGtfsFile(inputStream);
+                    }
                     break;
                 case HttpURLConnection.HTTP_MOVED_TEMP:
                 case HttpURLConnection.HTTP_MOVED_PERM:

src/main/java/com/conveyal/datatools/manager/persistence/FeedStore.java

@@ -139,7 +139,9 @@ public File newFeed (String id, InputStream inputStream, FeedSource feedSource)
         // NOTE: depending on the feed store, there may not be a feedSource provided (e.g., gtfsplus)
         File file = new File(path, id);
         LOG.info("Writing file to {}", file.getAbsolutePath());
-        ByteStreams.copy(inputStream, new FileOutputStream(file));
+        try (InputStream stream = inputStream; FileOutputStream outputStream = new FileOutputStream(file)) {
+            ByteStreams.copy(stream, outputStream);
+        }
         if (feedSource != null && !DataManager.useS3) {
             // Store latest as feed-source-id.zip if feedSource provided and if not using s3
             copyVersionToLatest(file, feedSource);