Bug 559097 - Compile warnings in I20200113-0130Y20200114-0045I20200113-1800

Fix rt.equinox.framework warnings.
Had to change formatter for org.eclipse.osgi to eclipse as there is no
"core" shipped to everyone and it can vary from user to user in case one
created his own.

Change-Id: I67be4f9c749598506011023428005a775f673178
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

1 files changed, 15 insertions, 12 deletions

diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
index 3e2d017de..3faa6b2e2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/StreamManagerTests.java
@@ -207,13 +207,14 @@ public class StreamManagerTests extends OSGiTest {
 			System.setProperty("osgi.useReliableFiles", "true"); // force reliable files
 			manager1 = new StorageManager(base, null);
 			manager1.open(true);
-			ManagedOutputStream fmos = manager1.getOutputStream(fileName);
-			assertNotNull(fmos);
-			DataOutputStream bufferedOut = new DataOutputStream(new BufferedOutputStream(fmos));
-			// 200 K of integers (200 * 1024 / 4)
-			for (int i = 0; i < (200 * 1024 / 4); i++)
-				bufferedOut.writeInt(i);
-			bufferedOut.close();
+			try (ManagedOutputStream fmos = manager1.getOutputStream(fileName)) {
+				assertNotNull(fmos);
+				try (DataOutputStream bufferedOut = new DataOutputStream(new BufferedOutputStream(fmos))) {
+					// 200 K of integers (200 * 1024 / 4)
+					for (int i = 0; i < (200 * 1024 / 4); i++)
+						bufferedOut.writeInt(i);
+				}
+			}
 			manager1.close();
 			manager1 = null;
 
@@ -221,11 +222,13 @@ public class StreamManagerTests extends OSGiTest {
 			System.setProperty("osgi.useReliableFiles", "true"); // force reliable files
 			manager2 = new StorageManager(base, null);
 			manager2.open(true);
-			InputStream is = manager2.getInputStream(fileName);
-			assertNotNull(is);
-			DataInputStream bufferedIn = new DataInputStream(new BufferedInputStream(is));
-			for (int i = 0; i < (200 * 1024 / 4); i++)
-				assertEquals("Wrong content found", i, bufferedIn.readInt());
+			try (InputStream is = manager2.getInputStream(fileName)) {
+				assertNotNull(is);
+				try (DataInputStream bufferedIn = new DataInputStream(new BufferedInputStream(is))) {
+					for (int i = 0; i < (200 * 1024 / 4); i++)
+						assertEquals("Wrong content found", i, bufferedIn.readInt());
+				}
+			}
 			manager2.close();
 			manager2 = null;