Author: cziegeler
Date: Thu Apr 25 14:23:43 2013
New Revision: 1475793
URL: http://svn.apache.org/r1475793
Log:
SLING-2841 : Dynamic classloader is not set for first resource from the jcr
iterator
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java?rev=1475793&r1=1475792&r2=1475793&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
Thu Apr 25 14:23:43 2013
@@ -118,6 +118,7 @@ public class JcrNodeResource extends Jcr
return resourceSuperType;
}
+ @Override
@SuppressWarnings("unchecked")
public <Type> Type adaptTo(Class<Type> type) {
if (type == Node.class || type == Item.class) {
@@ -168,6 +169,7 @@ public class JcrNodeResource extends Jcr
return super.adaptTo(type);
}
+ @Override
public String toString() {
return getClass().getSimpleName()
+ ", type=" + getResourceType()
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java?rev=1475793&r1=1475792&r2=1475793&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
Thu Apr 25 14:23:43 2013
@@ -60,8 +60,8 @@ public class JcrNodeResourceIterator imp
final ClassLoader dynamicClassLoader) {
this.resourceResolver = resourceResolver;
this.nodes = nodes;
- this.nextResult = seek();
this.dynamicClassLoader = dynamicClassLoader;
+ this.nextResult = seek();
}
public boolean hasNext() {
