[sling-org-apache-sling-feature-cpconverter] branch master updated: ACL manager reset in the finally statement

[simonetripodi]

This is an automated email from the ASF dual-hosted git repository.

simonetripodi pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git


The following commit(s) were added to refs/heads/master by this push:
     new 8bcd9e4  ACL manager reset in the finally statement
8bcd9e4 is described below

commit 8bcd9e41015da3eb03953231b2aa94c21ba75593
Author: Simo Tripodi <strip...@adobe.com>
AuthorDate: Thu May 16 00:51:16 2019 +0200

    ACL manager reset in the finally statement
---
 .../feature/cpconverter/ContentPackage2FeatureModelConverter.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
 
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index 13cdde5..c25f819 100644
--- 
a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ 
b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -186,9 +186,9 @@ public class ContentPackage2FeatureModelConverter extends 
BaseVaultPackageScanne
                 logger.info("Conversion complete!");
 
                 featuresManager.serialize();
-
-                aclManager.reset();
             } finally {
+                aclManager.reset();
+
                 try {
                     vaultPackage.close();
                 } catch (Exception e) {