Merge branch 'master' of https://github.com/exadel-inc/etoolbox-rollout-manager into develop

Author: smiakchilo

core/src/main/java/com/exadel/etoolbox/rolloutmanager/core/servlets/RolloutServlet.java

@@ -30,6 +30,8 @@
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.HttpConstants;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.servlets.annotations.SlingServletResourceTypes;
@@ -188,10 +190,18 @@ private RolloutStatus rollout(RolloutItem targetItem, PageManager pageManager, b
             status.setSuccess(false);
             String message = String.format("Item rollout failed, master: %s, target: %s", masterPath, targetPath);
             LOG.error(message, e);
+            discardUnsavedChanges(masterPage.get());
         }
         return status;
     }
 
+    private static void discardUnsavedChanges(Page masterPage) {
+        Optional.of(masterPage)
+                .map(page -> page.adaptTo(Resource.class))
+                .map(Resource::getResourceResolver)
+                .ifPresent(ResourceResolver::revert);
+    }
+
     private RolloutManager.RolloutParams toRolloutParams(Page masterPage, String targetPath, boolean isDeep) {
         RolloutManager.RolloutParams params = new RolloutManager.RolloutParams();
         params.master = masterPage;

core/src/test/java/com/exadel/etoolbox/rolloutmanager/core/servlets/RolloutServletTest.java

@@ -73,7 +73,7 @@ class RolloutServletTest {
             "/content/we-retail/ch/ca-es-ch-livecopy/experience"
     );
 
-    private final AemContext context = new AemContext(ResourceResolverType.JCR_MOCK);
+    private final AemContext context = new AemContext(ResourceResolverType.RESOURCERESOLVER_MOCK);
 
     @Mock
     private RolloutManager rolloutManager;