You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/09/20 18:32:53 UTC
svn commit: r448257 [2/2] - in /jackrabbit/trunk/jcr-server:
server/src/java/org/apache/jackrabbit/webdav/jcr/
server/src/java/org/apache/jackrabbit/webdav/simple/
webapp/src/java/org/apache/jackrabbit/j2ee/
Propchange: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImplEx.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImplEx.java
------------------------------------------------------------------------------
svn:keywords = author date id revision url
Modified: jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java?view=diff&rev=448257&r1=448256&r2=448257
==============================================================================
--- jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java (original)
+++ jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/JCRWebdavServerServlet.java Wed Sep 20 09:32:51 2006
@@ -137,12 +137,14 @@
// this may occur if the session was retrieved from the cache.
try {
Session repositorySesssion = JcrDavSession.getRepositorySession(request.getDavSession());
+ String reqWspName = resource.getLocator().getWorkspaceName();
String wsName = repositorySesssion.getWorkspace().getName();
- if (!resource.getLocator().isSameWorkspace(wsName)) {
+ // compare workspace names if the req. resource is not the root-collection.
+ if (reqWspName != null && !reqWspName.equals(wsName)) {
return false;
}
} catch (DavException e) {
- log.error(e.toString());
+ log.error("Internal error: " + e.toString());
return false;
}
Modified: jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java?view=diff&rev=448257&r1=448256&r2=448257
==============================================================================
--- jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java (original)
+++ jackrabbit/trunk/jcr-server/webapp/src/java/org/apache/jackrabbit/j2ee/SimpleWebdavServlet.java Wed Sep 20 09:32:51 2006
@@ -25,10 +25,10 @@
import org.apache.jackrabbit.webdav.DavResourceFactory;
import org.apache.jackrabbit.webdav.DavSessionProvider;
import org.apache.jackrabbit.webdav.WebdavRequest;
-import org.apache.jackrabbit.webdav.jcr.DavLocatorFactoryImpl;
import org.apache.jackrabbit.webdav.lock.LockManager;
import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
import org.apache.jackrabbit.webdav.simple.DavSessionProviderImpl;
+import org.apache.jackrabbit.webdav.simple.LocatorFactoryImplEx;
import org.apache.jackrabbit.webdav.simple.ResourceConfig;
import org.apache.jackrabbit.webdav.simple.ResourceFactoryImpl;
import org.slf4j.Logger;
@@ -204,7 +204,7 @@
*/
public DavLocatorFactory getLocatorFactory() {
if (locatorFactory == null) {
- locatorFactory = new DavLocatorFactoryImpl(resourcePathPrefix);
+ locatorFactory = new LocatorFactoryImplEx(resourcePathPrefix);
}
return locatorFactory;
}