svn commit: r1414571 - in /camel/trunk: camel-core/pom.xml components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java

[davsclaus]

Author: davsclaus
Date: Wed Nov 28 08:33:04 2012
New Revision: 1414571

URL: http://svn.apache.org/viewvc?rev=1414571&view=rev
Log:
Skip stress file tests as they were intended for manual testing. Though ought 
to run for a longer time though

Modified:
    camel/trunk/camel-core/pom.xml
    
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java

Modified: camel/trunk/camel-core/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1414571&r1=1414570&r2=1414571&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Wed Nov 28 08:33:04 2012
@@ -156,6 +156,10 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <!-- skip file stress tests as they are intended to run manually -->
+          <excludes>
+            <exclude>org/apache/camel/component/file/stress/**.java</exclude>
+          </excludes>
           <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
         </configuration>
       </plugin>

Modified: 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java?rev=1414571&r1=1414570&r2=1414571&view=diff
==============================================================================
--- 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
 (original)
+++ 
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
 Wed Nov 28 08:33:04 2012
@@ -313,8 +313,11 @@ public class ZooKeeperTestSupport extend
         File f = deleteStack.pollLast();
         if (f != null) {
             if (f.isDirectory()) {
-                for (File child : f.listFiles()) {
-                    deleteStack.addLast(child);
+                File[] files = f.listFiles();
+                if (files != null) {
+                    for (File child : files) {
+                        deleteStack.addLast(child);
+                    }
                 }
             }
             deleteDir(deleteStack);