You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2011/02/18 17:11:19 UTC
svn commit: r1072037 -
/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Author: fmeschbe
Date: Fri Feb 18 16:11:19 2011
New Revision: 1072037
URL: http://svn.apache.org/viewvc?rev=1072037&view=rev
Log:
SLING-1985 Guard access to originalAuthInfo which may be null
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=1072037&r1=1072036&r2=1072037&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java Fri Feb 18 16:11:19 2011
@@ -245,7 +245,9 @@ public class JcrResourceResolver
checkClosed();
final Set<String> names = new HashSet<String>();
names.addAll(Arrays.asList(getSession().getAttributeNames()));
- names.addAll(originalAuthInfo.keySet());
+ if (originalAuthInfo != null) {
+ names.addAll(originalAuthInfo.keySet());
+ }
return new Iterator<String>() {
final Iterator<String> keys = names.iterator();
@@ -293,7 +295,9 @@ public class JcrResourceResolver
if (sessionAttr != null) {
return sessionAttr;
}
- return originalAuthInfo.get(name);
+ if (originalAuthInfo != null) {
+ return originalAuthInfo.get(name);
+ }
}
// not a visible attribute