Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-03-05 19:26:17 +0000
committerAndrew Niefer2010-03-05 19:26:17 +0000
commit70aab4ba4d0e8411d5a21cb159e241458757a779 (patch)
treec9864881d6c0c48d1c3fc77701e06ae4494fc11b /bundles/org.eclipse.equinox.simpleconfigurator.manipulator
parentf0fc4a0e40d77ea685453d7e326060396e9a2900 (diff)
downloadrt.equinox.p2-70aab4ba4d0e8411d5a21cb159e241458757a779.tar.gz
rt.equinox.p2-70aab4ba4d0e8411d5a21cb159e241458757a779.tar.xz
rt.equinox.p2-70aab4ba4d0e8411d5a21cb159e241458757a779.zip
bug 304865 - filenotfound exception in shared install
Diffstat (limited to 'bundles/org.eclipse.equinox.simpleconfigurator.manipulator')
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
index 75ae9857f..851c40330 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
@@ -469,8 +469,14 @@ public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorMani
File configFile = getConfigFile(manipulator);
File installArea = ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData());
- //input stream will be closed for us
- BundleInfo[] toInstall = loadConfiguration(new FileInputStream(configFile), installArea.toURI());
+ BundleInfo[] toInstall = null;
+ try {
+ //input stream will be closed for us
+ toInstall = loadConfiguration(new FileInputStream(configFile), installArea.toURI());
+ } catch (FileNotFoundException e) {
+ //no file, just return an empty list
+ toInstall = new BundleInfo[0];
+ }
List toUninstall = new LinkedList();
if (exclusiveInstallation)

Back to the top