Bug 518740 - The Equinox Framework does not start on ARM using OracleI20170822-2000I20170821-2000

Embedded JRE

Additional changes from code review:
 - ensure streams are closed properly
 - update regex used to avoid extra trim operation.

Change-Id: I927eed5d66cff74fd8f494d32554248e9710e95e
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index 7ff03f26e..5129c9f41 100755
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -2690,6 +2690,8 @@ public class SystemBundleTests extends AbstractBundleTests {
 			doTestJavaProfile("1.7", "JavaSE-1.7", null);
 			doTestJavaProfile("1.8", "JavaSE/compact3-1.8", "compact3");
 			doTestJavaProfile("1.8", "JavaSE/compact3-1.8", "\"compact3\"");
+			doTestJavaProfile("1.8", "JavaSE/compact3-1.8", " \"compact3\" ");
+			doTestJavaProfile("1.8", "JavaSE/compact3-1.8", " compact3 ");
 			doTestJavaProfile("1.8", "JavaSE-1.8", "\"compact4\"");
 			doTestJavaProfile("9", "JavaSE/compact3-1.8", "compact3");
 			doTestJavaProfile("9", "JavaSE/compact3-1.8", "\"compact3\"");
@@ -2706,7 +2708,12 @@ public class SystemBundleTests extends AbstractBundleTests {
 			release.getParentFile().mkdirs();
 			Properties props = new Properties();
 			props.put("JAVA_PROFILE", releaseName);
-			props.store(new FileOutputStream(release), null);
+			FileOutputStream propStream = new FileOutputStream(release);
+			try {
+				props.store(propStream, null);
+			} finally {
+				propStream.close();
+			}
 			System.setProperty("java.home", release.getParentFile().getAbsolutePath());
 		}
 		System.setProperty("java.specification.version", javaSpecVersion);