Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2018-11-01 11:15:17 +0000
committerMat Booth2018-11-01 11:15:17 +0000
commitf1ebb4ca8f03e0d9118fe5f832da8c6166c9f03b (patch)
tree06033a222bd217aaf8e0a8e8202b916927e5764a
parent96d632e6fbd55d4c0bd4d271646ca6c902097306 (diff)
downloadrt.equinox.p2-I20181101-1800.tar.gz
rt.equinox.p2-I20181101-1800.tar.xz
rt.equinox.p2-I20181101-1800.zip
Bug 540310 - Eclipse Fails to start if the mtime of the bundles.info file is zeroI20181101-1800
Fix tests failing with UnsupportedOperationException on Windows. Change-Id: Iac435bedca69156d40861bc32442d8827915a6cc Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
index c1735df11..7cecf5db2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
@@ -131,7 +131,7 @@ public class SimpleConfiguratorTest extends AbstractProvisioningTest {
try {
FileTime ft = (FileTime) Files.getAttribute(file.toPath(), "unix:ctime");
ctime = ft.toMillis();
- } catch (IllegalArgumentException | IOException e) {
+ } catch (UnsupportedOperationException | IllegalArgumentException | IOException e) {
// Not applicable on non-posix platforms
}
if (storeZero) {
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
index c6512e33c..dfd9496fe 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
@@ -414,7 +414,7 @@ public class SimpleConfiguratorUtils {
// platforms creation time is a synonym for last modified time)
FileTime ctime = (FileTime) Files.getAttribute(file.toPath(), "unix:ctime");
lastModified = ctime.toMillis();
- } catch (IllegalArgumentException | IOException e) {
+ } catch (UnsupportedOperationException | IllegalArgumentException | IOException e) {
// We expect this attribute to not exist on non-posix platforms like Windows
}
}

Back to the top