You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2014/07/23 15:29:22 UTC
svn commit: r1612830 - in
/felix/trunk/framework/src/test/java/org/apache/felix/framework:
PackageAdminImplTest.java StartStopBundleTest.java
Author: rickhall
Date: Wed Jul 23 13:29:22 2014
New Revision: 1612830
URL: http://svn.apache.org/r1612830
Log:
Apply patch (FELIX-4569) to fix some issues that arise under Windows 8.
Modified:
felix/trunk/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java
felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
Modified: felix/trunk/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java?rev=1612830&r1=1612829&r2=1612830&view=diff
==============================================================================
--- felix/trunk/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java (original)
+++ felix/trunk/framework/src/test/java/org/apache/felix/framework/PackageAdminImplTest.java Wed Jul 23 13:29:22 2014
@@ -149,9 +149,13 @@ public class PackageAdminImplTest extend
{
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();
Modified: felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java?rev=1612830&r1=1612829&r2=1612830&view=diff
==============================================================================
--- felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java (original)
+++ felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java Wed Jul 23 13:29:22 2014
@@ -119,6 +119,7 @@ public class StartStopBundleTest extends
assertTrue((t1 - t0) > DELAY / 2);
} finally {
f.stop();
+ Thread.sleep(DELAY);
deleteDir(cacheDir);
}
}