inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of goofy looking paths.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-05-10 15:55:41 +00:00
parent d69bfa23af
commit 78377ba5c3
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
View File

@@ -674,10 +674,10 @@ public class DeploymentServiceImpl implements DeploymentService
// This means no entry on src so delete. // This means no entry on src so delete.
if (src == null) if (src == null)
{ {
String newDstPath = dstPath + '/' + dst.getName(); String newDstPath = extendPath(dstPath, dst.getName());
service.delete(ticket, newDstPath); service.delete(ticket, newDstPath);
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.DELETED, DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.DELETED,
new Pair<Integer, String>(version, srcPath + '/' + dst.getName()), new Pair<Integer, String>(version, extendPath(srcPath, dst.getName())),
newDstPath); newDstPath);
if (callback != null) if (callback != null)
{ {
@@ -713,7 +713,7 @@ public class DeploymentServiceImpl implements DeploymentService
if (src.isFile()) if (src.isFile())
{ {
copyFile(service, ticket, report, callback, version, src, copyFile(service, ticket, report, callback, version, src,
dstPath + '/' + dst.getName()); extendPath(dstPath, dst.getName()));
src = null; src = null;
dst = null; dst = null;
continue; continue;
@@ -725,7 +725,7 @@ public class DeploymentServiceImpl implements DeploymentService
{ {
service.setGuid(ticket, dstPath, src.getGuid()); service.setGuid(ticket, dstPath, src.getGuid());
} }
deployDirectoryPush(service, ticket, report, callback, version, src.getPath(), dstPath + '/' + dst.getName()); deployDirectoryPush(service, ticket, report, callback, version, src.getPath(), extendPath(dstPath, dst.getName()));
src = null; src = null;
dst = null; dst = null;
continue; continue;
@@ -737,10 +737,10 @@ public class DeploymentServiceImpl implements DeploymentService
} }
// diff > 0 // diff > 0
// Destination is missing in source, delete it. // Destination is missing in source, delete it.
String newDstPath = dstPath + '/' + dst.getName(); String newDstPath = extendPath(dstPath, dst.getName());
service.delete(ticket, newDstPath); service.delete(ticket, newDstPath);
DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.DELETED, DeploymentEvent event = new DeploymentEvent(DeploymentEvent.Type.DELETED,
new Pair<Integer, String>(version, srcPath + '/' + dst.getName()), new Pair<Integer, String>(version, extendPath(srcPath, dst.getName())),
newDstPath); newDstPath);
if (callback != null) if (callback != null)
{ {
@@ -801,7 +801,7 @@ public class DeploymentServiceImpl implements DeploymentService
DeploymentReport report, DeploymentCallback callback, DeploymentReport report, DeploymentCallback callback,
int version, AVMNodeDescriptor src, String parentPath) int version, AVMNodeDescriptor src, String parentPath)
{ {
String dstPath = parentPath + '/' + src.getName(); String dstPath = extendPath(parentPath, src.getName());
if (src.isFile()) if (src.isFile())
{ {
copyFile(service, ticket, report, callback, version, src, dstPath); copyFile(service, ticket, report, callback, version, src, dstPath);
@@ -823,4 +823,19 @@ public class DeploymentServiceImpl implements DeploymentService
copy(service, ticket, report, callback, version, child, dstPath); copy(service, ticket, report, callback, version, child, dstPath);
} }
} }
/**
* Extend a path.
* @param path
* @param name
* @return
*/
private String extendPath(String path, String name)
{
if (path.endsWith("/"))
{
return path + name;
}
return path + '/' + name;
}
} }