Author: justin
Date: Mon Aug 16 14:13:25 2010
New Revision: 985944
URL: http://svn.apache.org/viewvc?rev=985944&view=rev
Log:
SLING-1654 - using ResourceResolver.adaptTo(Session.class) to get the Session
instead of getting the session directly as a request attribute
Modified:
sling/trunk/bundles/jcr/webdav/pom.xml
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
Modified: sling/trunk/bundles/jcr/webdav/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=985944&r1=985943&r2=985944&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/webdav/pom.xml (original)
+++ sling/trunk/bundles/jcr/webdav/pom.xml Mon Aug 16 14:13:25 2010
@@ -145,5 +145,17 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.auth.core</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.0.8</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified:
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java?rev=985944&r1=985943&r2=985944&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
(original)
+++
sling/trunk/bundles/jcr/webdav/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingSessionProvider.java
Mon Aug 16 14:13:25 2010
@@ -24,6 +24,8 @@ import javax.jcr.Session;
import javax.servlet.http.HttpServletRequest;
import org.apache.jackrabbit.server.SessionProvider;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.auth.core.AuthenticationSupport;
/**
* The <code>SlingSessionProvider</code> is a Jackrabbit WebDAV server
@@ -62,7 +64,13 @@ public class SlingSessionProvider implem
}
// otherwise return the session from the request attribute
- return (Session) request.getAttribute(ATTR_SESSION_NAME);
+ ResourceResolver resourceResolver = (ResourceResolver)
+
request.getAttribute(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER);
+
+ if (resourceResolver == null) {
+ return null;
+ }
+ return resourceResolver.adaptTo(Session.class);
}
/**
