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

Fixed WCM-11. Semantics of getDirectoryListingDirect() are consistent now.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-03 21:13:16 +00:00
parent 9455745ba8
commit 9a2a67605c
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -99,6 +99,10 @@ public class AVMServiceTest extends AVMServiceTestBase
fService.getDirectoryListingDirect(-1, fService.getDirectoryListingDirect(-1,
"main:/layer"); "main:/layer");
assertEquals(0, listing.size()); assertEquals(0, listing.size());
listing =
fService.getDirectoryListingDirect(-1,
"main:/layer/b");
assertEquals(0, listing.size());
fService.createFile("main:/layer/b/c", "sigmoid").close(); fService.createFile("main:/layer/b/c", "sigmoid").close();
fService.createSnapshot("main"); fService.createSnapshot("main");
listing = fService.getDirectoryListingDirect(-1, "main:/layer"); listing = fService.getDirectoryListingDirect(-1, "main:/layer");

4
source/java/org/alfresco/repo/avm/AVMStoreImpl.java
View File

@@ -320,6 +320,10 @@ class AVMStoreImpl implements AVMStore, Serializable
{ {
Lookup lPath = lookupDirectory(version, path, false); Lookup lPath = lookupDirectory(version, path, false);
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode(); DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (lPath.isLayered() && dir.getType() != AVMNodeType.LAYERED_DIRECTORY)
{
return new TreeMap<String, AVMNodeDescriptor>();
}
Map<String, AVMNode> listing = dir.getListingDirect(lPath); Map<String, AVMNode> listing = dir.getListingDirect(lPath);
return translateListing(listing, lPath); return translateListing(listing, lPath);
} }

1
source/java/org/alfresco/repo/avm/Lookup.java
View File

@@ -134,6 +134,7 @@ class Lookup
{ {
comp.setIndirection(computeIndirection(name)); comp.setIndirection(computeIndirection(name));
} }
fLayeredYet = true;
} }
fComponents.add(comp); fComponents.add(comp);
fPosition++; fPosition++;