incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1144205 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Date Fri, 08 Jul 2011 09:20:39 GMT
Author: cziegeler
Date: Fri Jul  8 09:20:39 2011
New Revision: 1144205

URL: http://svn.apache.org/viewvc?rev=1144205&view=rev
Log:
SLING-2130 : Workspace prefix should only be set if use multiple workspaces is activated

Modified:
    sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java

Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=1144205&r1=1144204&r2=1144205&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
(original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Fri Jul  8 09:20:39 2011
@@ -814,7 +814,7 @@ public class JcrResourceResolver
             Resource result = (path != null) ? getResourceInternal(path) : null;
             if ( result != null ) {
                 String workspacePrefix = null;
-                if ( !getSession().getWorkspace().getName().equals(this.factory.getDefaultWorkspaceName())
) {
+                if ( useMultiWorkspaces && !getSession().getWorkspace().getName().equals(this.factory.getDefaultWorkspaceName())
) {
                     workspacePrefix = getSession().getWorkspace().getName();
                 }
 
@@ -885,7 +885,7 @@ public class JcrResourceResolver
         }
 
         String workspacePrefix = null;
-        if ( !getSession().getWorkspace().getName().equals(this.factory.getDefaultWorkspaceName())
) {
+        if ( useMultiWorkspaces && !getSession().getWorkspace().getName().equals(this.factory.getDefaultWorkspaceName())
) {
             workspacePrefix = getSession().getWorkspace().getName();
         }
 



Mime
View raw message