Author: justin
Date: Wed Jul 21 14:58:47 2010
New Revision: 966267
URL: http://svn.apache.org/viewvc?rev=966267&view=rev
Log:
SLING-1609 - stripping workspace name from path for name generation
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ImportOperation.java
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ImportOperation.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ImportOperation.java?rev=966267&r1=966266&r2=966267&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ImportOperation.java
(original)
+++
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/ImportOperation.java
Wed Jul 21 14:58:47 2010
@@ -105,6 +105,7 @@ public class ImportOperation extends Abs
final boolean checkin =
"true".equals(request.getParameter(SlingPostConstants.RP_CHECKIN));
String basePath = getItemPath(request);
+ basePath = removeAndValidateWorkspace(basePath,
request.getResourceResolver().adaptTo(Session.class));
if (basePath.endsWith("/")) {
//remove the trailing slash
basePath = basePath.substring(0, basePath.length() - 1);