Author: dkuleshov Date: 2010-12-01 04:41:11 -0500 (Wed, 01 Dec 2010) New Revision: 3580 Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/utils/TestUtils.java Log: EXOJCR-1058: modified token in if header parsing Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-12-01 07:14:26 UTC (rev 3579) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-12-01 09:41:11 UTC (rev 3580) @@ -575,6 +575,10 @@ if (lockTokenHeader != null) { lockTokenHeader = lockTokenHeader.substring(1, lockTokenHeader.length() - 1); + if (lockTokenHeader.contains(WebDavConst.Lock.OPAQUE_LOCK_TOKEN)) + { + lockTokenHeader = lockTokenHeader.split(":")[1]; + } } return new DeleteCommand().delete(session, path(repoPath), lockTokenHeader); } @@ -1374,7 +1378,7 @@ { lockTokenHeader = lockTokenHeader.substring(1, lockTokenHeader.length() - 1); - if (lockTokenHeader.contains("opaquelocktoken")) + if (lockTokenHeader.contains(WebDavConst.Lock.OPAQUE_LOCK_TOKEN)) { lockTokenHeader = lockTokenHeader.split(":")[1]; } @@ -1386,6 +1390,10 @@ { String headerLockToken = ifHeader.substring(ifHeader.indexOf("(")); headerLockToken = headerLockToken.substring(2, headerLockToken.length() - 2); + if (headerLockToken.contains(WebDavConst.Lock.OPAQUE_LOCK_TOKEN)) + { + headerLockToken = headerLockToken.split(":")[1]; + } lockTokens.add(headerLockToken); } Modified: jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/utils/TestUtils.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/utils/TestUtils.java 2010-12-01 07:14:26 UTC (rev 3579) +++ jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/utils/TestUtils.java 2010-12-01 09:41:11 UTC (rev 3580) @@ -19,6 +19,7 @@ package org.exoplatform.services.jcr.webdav.utils; import org.exoplatform.common.http.client.HTTPConnection; +import org.exoplatform.services.jcr.webdav.WebDavConst; import org.exoplatform.services.jcr.webdav.WebDavConstants.WebDav; import org.exoplatform.services.jcr.webdav.util.TextUtil; import org.w3c.dom.Document; @@ -192,7 +193,7 @@ session.save(); String tok = lock.getLockToken(); // System.out.println("TestUtils.lockNode()" + tok); - return "<" + tok + ">"; + return "<" + WebDavConst.Lock.OPAQUE_LOCK_TOKEN + ":" + tok + ">"; } public static void find(Session session, String queryString) throws InvalidQueryException, RepositoryException