Index: /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/HTTPLogParserTest.java
===================================================================
--- /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/HTTPLogParserTest.java	(revision 2233)
+++ /trunk/autoquest-plugin-http-test/src/test/java/de/ugoe/cs/autoquest/http/HTTPLogParserTest.java	(revision 2234)
@@ -265,5 +265,5 @@
             	File[] children = file.listFiles();
             	if (children != null) {
-                    for (File child : file.listFiles()) {
+                    for (File child : children) {
                         deleteFiles(child);
                     }
Index: /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/SOAPUtils.java
===================================================================
--- /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/SOAPUtils.java	(revision 2233)
+++ /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/SOAPUtils.java	(revision 2234)
@@ -833,12 +833,14 @@
             return true;
         }
-        if ((request != null && response == null) || (request == null && response != null)) {
+        else if ((request != null && response == null) || (request == null && response != null)) {
             return false;
         }
-        return request.getCallType().equals(CallType.REQUEST) &&
-            response.getCallType().equals(CallType.RESPONSE) &&
-            HTTPUtils.equals(request.getCalledMethod(), response.getCalledMethod()) &&
-            HTTPUtils.equals(request.getServiceName(), response.getServiceName()) &&
-            HTTPUtils.equals(request.getClientName(), response.getClientName());
+        else {
+            return request.getCallType().equals(CallType.REQUEST) &&
+                response.getCallType().equals(CallType.RESPONSE) &&
+                HTTPUtils.equals(request.getCalledMethod(), response.getCalledMethod()) &&
+                HTTPUtils.equals(request.getServiceName(), response.getServiceName()) &&
+                HTTPUtils.equals(request.getClientName(), response.getClientName());
+        }
     }
 
Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDcorrectDirOldJFC.java
===================================================================
--- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDcorrectDirOldJFC.java	(revision 2233)
+++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDcorrectDirOldJFC.java	(revision 2234)
@@ -72,5 +72,5 @@
         
         if (children != null) {
-            for (String filename : folder.list()) {
+            for (String filename : children) {
                 String source = absolutPath + "/" + filename;
                 String dest = absolutDestPath + "/" + filename;
Index: /trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java
===================================================================
--- /trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java	(revision 2233)
+++ /trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeChecker.java	(revision 2234)
@@ -134,5 +134,5 @@
                          expected.getClass(), checked.getClass());
             
-            if ((expected != null) && (expected.size() > 0)) {
+            if (expected.size() > 0) {
                 assertNotNull(expected.toString() + ": children not there", checked);
                 assertEquals(expected.toString() + ": different number of children",