diff options
| author | Thomas Watson | 2017-08-21 17:01:31 +0000 |
|---|---|---|
| committer | Thomas Watson | 2017-08-21 17:01:31 +0000 |
| commit | e47a6cbd20d91e10988d4432e449d6ed4663f320 (patch) | |
| tree | be2dfae2df33e4ffa280bb462cf099258d89b1cc /bundles/org.eclipse.osgi | |
| parent | 32a0676fe839baab0c166853a4101c244a3c1a11 (diff) | |
| download | rt.equinox.framework-e47a6cbd20d91e10988d4432e449d6ed4663f320.tar.gz rt.equinox.framework-e47a6cbd20d91e10988d4432e449d6ed4663f320.tar.xz rt.equinox.framework-e47a6cbd20d91e10988d4432e449d6ed4663f320.zip | |
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>
Diffstat (limited to 'bundles/org.eclipse.osgi')
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index e4f518ca6..d891eff5d 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -1432,13 +1432,12 @@ public class Storage { File release = new File(javaHome, "release"); //$NON-NLS-1$ if (release.exists()) { Properties releaseProps = new Properties(); - try { - releaseProps.load(new FileInputStream(release)); + try (InputStream releaseStream = new FileInputStream(release)) { + releaseProps.load(releaseStream); String releaseName = releaseProps.getProperty("JAVA_PROFILE"); //$NON-NLS-1$ if (releaseName != null) { // make sure to remove extra quotes - releaseName = releaseName.trim(); - releaseName = releaseName.replaceAll("^\"|\"$", ""); //$NON-NLS-1$ //$NON-NLS-2$ + releaseName = releaseName.replaceAll("^\\s*\"?|\"?\\s*$", ""); //$NON-NLS-1$ //$NON-NLS-2$ embeddedProfileName = "_" + releaseName + "-"; //$NON-NLS-1$ //$NON-NLS-2$ } } catch (IOException e) { |