Merged HEAD (5.1) to 5.1.N (5.1.1)

121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:49:19 +00:00
parent c1d4fccc48
commit 9f2d3441df
63 changed files with 643 additions and 638 deletions

View File

@@ -33,14 +33,14 @@ import org.alfresco.service.cmr.repository.Path;
public class GetPathMethod extends AbstractProtocolMethod<Path>
{
private VirtualStore virtualStore;
private VirtualStore smartStore;
private ActualEnvironment environment;
public GetPathMethod(VirtualStore virtualStore, ActualEnvironment actualEnvironment)
public GetPathMethod(VirtualStore smartStore, ActualEnvironment actualEnvironment)
{
super();
this.virtualStore = virtualStore;
this.smartStore = smartStore;
this.environment = actualEnvironment;
}
@@ -64,7 +64,7 @@ public class GetPathMethod extends AbstractProtocolMethod<Path>
{
path = environment.getPath(actualNodeRef);
}
Path virtualPath = virtualStore.getPath(reference);
Path virtualPath = smartStore.getPath(reference);
return path.append(virtualPath);
}
catch (ReferenceEncodingException e)