justinedelson closed pull request #4: SLING-7508: fixed endless recursion
getModelClassForResource()
URL: https://github.com/apache/sling-org-apache-sling-models-impl/pull/4
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
b/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
index 3ee2fa5..8bac535 100644
--- a/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
+++ b/src/main/java/org/apache/sling/models/impl/AdapterImplementations.java
@@ -319,7 +319,11 @@ public void removeResourceTypeBindings(final Bundle
bundle) {
}
}
Resource resourceTypeResource =
resolver.getResource(originalResourceType);
- return getModelClassForResource(resourceTypeResource, map);
+ if (resourceTypeResource != null &&
!resourceTypeResource.getPath().equals(resource.getPath())) {
+ return getModelClassForResource(resourceTypeResource, map);
+ } else {
+ return null;
+ }
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
