Merge revision 959617 from trunk into the 1.6.1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988713 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..4639d7a692 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
@@ -18,6 +18,9 @@
  */
 package util;
 
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+
 import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
 
 
@@ -37,6 +40,12 @@ public  class OSGiTestUtil  {
         String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties";
         
         System.setProperty("felix.config.properties", felixConfigFileName);
+
+		// delete any cached OSGI bundles left over from previous test executions
+		File felixCache = new File("target/.felix");
+		if (felixCache.exists()) {
+		    FileUtils.cleanDirectory(felixCache);
+		}
         
         try {