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 2011/08/12 10:50:33 UTC
svn commit: r1157011 -
/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
Author: cziegeler
Date: Fri Aug 12 08:50:33 2011
New Revision: 1157011
URL: http://svn.apache.org/viewvc?rev=1157011&view=rev
Log:
SLING-2167 : Use session from default implementation to let the tests pass
Modified:
sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
Modified: sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java?rev=1157011&r1=1157010&r2=1157011&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java (original)
+++ sling/trunk/bundles/jcr/davex/src/main/java/org/apache/sling/jcr/davex/impl/servlets/SlingDavExServlet.java Fri Aug 12 08:50:33 2011
@@ -103,15 +103,18 @@ public class SlingDavExServlet extends J
@Override
protected SessionProvider getSessionProvider() {
+ // TODO - we have to fix this!!
+ final SessionProvider sp = super.getSessionProvider();
return new SessionProvider() {
public Session getSession(final HttpServletRequest req,
- final Repository paramRepository,
- final String paramString)
+ final Repository repository,
+ final String workspace)
throws LoginException, ServletException, RepositoryException {
final ResourceResolver resolver = (ResourceResolver) req.getAttribute(AuthenticationSupport.REQUEST_ATTRIBUTE_RESOLVER);
if ( resolver != null ) {
- return resolver.adaptTo(Session.class);
+ final Session superSession = sp.getSession(req, repository, workspace);
+ return superSession;
}
return null;
}