A few try/resources

phxd88 · Dec 6, 2019 · 30565df · 30565df
1 parent 0437367
commit 30565df
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/BimServerClientLib/src/org/bimserver/client/BimServerClient.java b/BimServerClientLib/src/org/bimserver/client/BimServerClient.java
@@ -380,12 +380,9 @@ public void download(long roid, long serializerOid, OutputStream outputStream) t
 			if (progress != null && progress.getState() == SActionState.AS_ERROR) {
 				throw new BimServerClientException(Joiner.on(", ").join(progress.getErrors()));
 			} else {
-				InputStream inputStream = getDownloadData(topicId);
-				try {
+				try (InputStream inputStream = getDownloadData(topicId)) {
 					IOUtils.copy(inputStream, outputStream);
 					getServiceInterface().cleanupLongAction(topicId);
-				} finally {
-					inputStream.close();
 				}
 			}
 		} catch (ServerException e) {
@@ -419,13 +416,13 @@ public void download(long roid, Query query, long serializerOid, Path file) thro
 	@Override
 	public void download(long roid, String query, long serializerOid, Path file) throws ServerException, UserException, PublicInterfaceNotFoundException, IOException {
 		Long topicId = getServiceInterface().download(Collections.singleton(roid), query, serializerOid, false);
-		InputStream downloadData = getDownloadData(topicId);
-		FileOutputStream fos = new FileOutputStream(file.toFile());
-		try {
-			IOUtils.copy(downloadData, fos);
-		} finally {
-			downloadData.close();
-			fos.close();
+		try (InputStream downloadData = getDownloadData(topicId)) {
+			FileOutputStream fos = new FileOutputStream(file.toFile());
+			try {
+				IOUtils.copy(downloadData, fos);
+			} finally {
+				fos.close();
+			}
 		}
 	}
 

diff --git a/BimServerClientLib/src/org/bimserver/client/ClientIfcModel.java b/BimServerClientLib/src/org/bimserver/client/ClientIfcModel.java
@@ -366,14 +366,15 @@ public void loadGeometry() throws QueryException, ServerException, UserException
 			long topicId = bimServerClient.query(query, roid, serializerOid);
 			// TODO use websocket notifications
 			bimServerClient.waitForDonePreparing(topicId);
-			InputStream inputStream = bimServerClient.getDownloadData(topicId);
-			clientDebugInfo.incrementGeometryGetDownloadData();
-			try {
-				processGeometryInputStream(inputStream);
-			} catch (Throwable e) {
-				e.printStackTrace();
-			} finally {
-				bimServerClient.getServiceInterface().cleanupLongAction(topicId);
+			try (InputStream inputStream = bimServerClient.getDownloadData(topicId)) {
+				clientDebugInfo.incrementGeometryGetDownloadData();
+				try {
+					processGeometryInputStream(inputStream);
+				} catch (Throwable e) {
+					e.printStackTrace();
+				} finally {
+					bimServerClient.getServiceInterface().cleanupLongAction(topicId);
+				}
 			}
 		}
 	}

diff --git a/BimServerClientLib/src/org/bimserver/client/GeometryLoader.java b/BimServerClientLib/src/org/bimserver/client/GeometryLoader.java
@@ -271,8 +271,7 @@ private void fetch(long roid, Query query, long serializerOid) throws ServerExce
 		long topicId = bimServerClient.query(query, roid, serializerOid);
 		// TODO use websocket notifications
 		bimServerClient.waitForDonePreparing(topicId);
-		InputStream inputStream = bimServerClient.getDownloadData(topicId);
-		try {
+		try (InputStream inputStream = bimServerClient.getDownloadData(topicId)) {
 			load(inputStream);
 		} catch (Throwable e) {
 			e.printStackTrace();