| commit | d63e4b246c07fc7145f167d6f6a8b79f1650d185 | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Wed Jul 23 13:29:22 2014 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Wed Jul 23 13:29:22 2014 +0000 |
| tree | 668e355bea03d980455c1db8a96afc102cd0dd90 | |
| parent | f779a2680c9ae84a8be90cfcf011905d3ff0d7f6 [diff] |
Apply patch (FELIX-4569) to fix some issues that arise under Windows 8. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1612830 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java b/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java index 8442f20..bc295ba 100644 --- a/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java +++ b/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java
@@ -149,9 +149,13 @@ { if (root.isDirectory()) { - for (File file : root.listFiles()) + File[] files = root.listFiles(); + if (files != null) { - deleteDir(file); + for (File file : files) + { + deleteDir(file); + } } } root.delete();
diff --git a/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java b/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java index 315606c..4607b3f 100644 --- a/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java +++ b/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
@@ -119,6 +119,7 @@ assertTrue((t1 - t0) > DELAY / 2); } finally { f.stop(); + Thread.sleep(DELAY); deleteDir(cacheDir); } }