Repository: brooklyn-server Updated Branches: refs/heads/master 4ce236d5e -> 7ca3bcb19
CatalogResource closes ZipFiles cleanly Rather than relying on it to occure in ZipFile's finaliser Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/25b3492e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/25b3492e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/25b3492e Branch: refs/heads/master Commit: 25b3492e84a8812f2e8341a526bfc0fd309e15ec Parents: 4ce236d Author: Sam Corbett <[email protected]> Authored: Thu May 4 19:48:25 2017 +0100 Committer: Sam Corbett <[email protected]> Committed: Thu May 4 19:48:25 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/rest/resources/CatalogResource.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25b3492e/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index e03bd41..d0f7270 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -198,6 +198,14 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat } catch (IOException e) { throw new IllegalArgumentException("Error reading catalog.bom from ZIP/JAR archive: "+e); } + + try { + zf.close(); + } catch (IOException e) { + log.debug("Swallowed exception closing zipfile. Full error logged at trace: {}", e.getMessage()); + log.trace("Exception closing zipfile", e); + } + VersionedName vn = BasicBrooklynCatalog.getVersionedName( BasicBrooklynCatalog.getCatalogMetadata(bomS) ); Manifest mf = bm.getManifest(f);
