This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch SLING-8913-multiple-instance-types in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit fe98d6a95774a8168019bd549ab62cd617044454 Author: Dan Klco <[email protected]> AuthorDate: Fri Aug 28 22:03:48 2020 -0400 Ensuring the path is set if a failure publishing occurs --- .../org/apache/sling/cms/core/publication/PublishPostOperation.java | 2 +- .../org/apache/sling/cms/core/publication/UnpublishPostOperation.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/sling/cms/core/publication/PublishPostOperation.java b/core/src/main/java/org/apache/sling/cms/core/publication/PublishPostOperation.java index ad1672b..e9dbf51 100644 --- a/core/src/main/java/org/apache/sling/cms/core/publication/PublishPostOperation.java +++ b/core/src/main/java/org/apache/sling/cms/core/publication/PublishPostOperation.java @@ -47,6 +47,7 @@ public class PublishPostOperation implements PostOperation { public void run(SlingHttpServletRequest request, PostResponse response, SlingPostProcessor[] processors) { final List<Modification> changes = new ArrayList<>(); try { + response.setPath(request.getResource().getPath()); publicationManagerFactory.getPublicationManager() .publish(request.getResource().adaptTo(PublishableResource.class)); @@ -58,7 +59,6 @@ public class PublishPostOperation implements PostOperation { request.getResourceResolver().commit(); - response.setPath(request.getResource().getPath()); response.onModified(request.getResource().getPath()); } catch (Exception e) { log.error("Failed to publish", e); diff --git a/core/src/main/java/org/apache/sling/cms/core/publication/UnpublishPostOperation.java b/core/src/main/java/org/apache/sling/cms/core/publication/UnpublishPostOperation.java index 1dff941..56313c4 100644 --- a/core/src/main/java/org/apache/sling/cms/core/publication/UnpublishPostOperation.java +++ b/core/src/main/java/org/apache/sling/cms/core/publication/UnpublishPostOperation.java @@ -47,6 +47,8 @@ public class UnpublishPostOperation implements PostOperation { public void run(SlingHttpServletRequest request, PostResponse response, SlingPostProcessor[] processors) { final List<Modification> changes = new ArrayList<>(); try { + + response.setPath(request.getResource().getPath()); publicationManagerFactory.getPublicationManager() .unpublish(request.getResource().adaptTo(PublishableResource.class)); @@ -58,7 +60,6 @@ public class UnpublishPostOperation implements PostOperation { request.getResourceResolver().commit(); - response.setPath(request.getResource().getPath()); response.onModified(request.getResource().getPath()); } catch (Exception e) { log.error("Failed to publish", e);
