You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/01/16 10:40:33 UTC
svn commit: r612395 -
/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Author: cziegeler
Date: Wed Jan 16 01:40:31 2008
New Revision: 612395
URL: http://svn.apache.org/viewvc?rev=612395&view=rev
Log:
objectContentManager might not be initialized when adaptTo is invoked, use getObjectContentManager() instead.
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=612395&r1=612394&r2=612395&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java Wed Jan 16 01:40:31 2008
@@ -211,7 +211,7 @@
if (type == Session.class) {
return (AdapterType) getSession();
} else if (type == ObjectContentManager.class) {
- return (AdapterType) objectContentManager;
+ return (AdapterType) getObjectContentManager();
} else if (type == PathResolver.class) {
return (AdapterType) this;
}