From 6824342763f82eb08ca074332b9a9687b55649ca Mon Sep 17 00:00:00 2001
From: Konrad Windszus <konrad.windszus@netcentric.biz>
Date: Wed, 12 Nov 2014 14:19:46 +0100
Subject: [PATCH] SLING-4159, close resource resolver in finally

---
 .../sling/validation/impl/ValidationServiceImpl.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java b/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
index f1820e5ce2..a1578907a5 100644
--- a/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
+++ b/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
@@ -329,9 +329,10 @@ private Trie<JCRValidationModel> searchAndStoreValidationModel(String validatedR
             }
         } catch (LoginException e) {
             LOG.error("Unable to obtain a resource resolver.", e);
-        }
-        if (rr != null) {
-            rr.close();
+        } finally {
+            if (rr != null) {
+                rr.close();
+            }
         }
         return modelsForResourceType;
     }