commit b1ac26cfe2a6b4c6c20bbe30c5d2b3191e8bb5dc
author Justin Edelson <justin@apache.org> Mon Feb 26 14:32:59 2018 -0500
committer Justin Edelson <justin@apache.org> Mon Feb 26 14:32:59 2018 -0500
tree 93375c3bd9375d026cb193eb14607f21c1242bf1
parent b0647a3419924c46e58b78aa6384e0f49491a0c6

SLING-7517 - fix fake request object memory leak for interface-based models.

src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java

diff --git a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
index 9fcdb12..3f50ad8 100644
--- a/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
+++ b/src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
@@ -606,8 +606,9 @@
         if (!registry.callbacks.isEmpty()) {
             registry.seal();
 
-            if (adaptable instanceof ServletRequest) {
-                registerRequestCallbackRegistry((ServletRequest) adaptable, registry);
+            if (adaptable instanceof SlingHttpServletRequest &&
+                    ((SlingHttpServletRequest) adaptable).getAttribute(REQUEST_MARKER_ATTRIBUTE) == REQUEST_MARKER_VALUE) {
+                registerRequestCallbackRegistry((SlingHttpServletRequest) adaptable, registry);
             } else {
                 registerCallbackRegistry(handler, registry);
             }