commit 70218858a34525cfb2e8febd12c86df3984f34eb
author Bertrand Delacretaz <bdelacretaz@apache.org> Tue Oct 28 14:58:14 2014 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Tue Oct 28 14:58:14 2014 +0000
tree f6b7a2370377556d381a09e29abbe4de01dcbe5e
parent b8571029dd35aa771797154977d1de6ba01be969

SLING-4058 - don't faill all tests if one times out

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1634889 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java

diff --git a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
index c48a811..33c2332 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
@@ -70,7 +70,6 @@
     private static List<String> toDelete = new ArrayList<String>();
     private static ResourceResolverFactory cleanupResolverFactory;
     private MappingsFacade mappingsFacade;
-    private static String saveMappingsError;
     
     @TestReference
     private EventsCounter eventsCounter;
@@ -87,13 +86,9 @@
     }
     
     private void saveMappings(Session s) throws Exception {
+        final String saveMappingsError = mappingsFacade.saveMappings(s);
         if(saveMappingsError != null) {
             fail(saveMappingsError);
-        } else {
-            saveMappingsError = mappingsFacade.saveMappings(s);
-            if(saveMappingsError != null) {
-                fail(saveMappingsError);
-            }
         }
     }