LPS-25702 Apply logic to getLocalRepositoryImpl()

natecavanaugh · Apr 10, 2012 · b83bd2e · b83bd2e
1 parent a24dfaf
commit b83bd2e
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/RepositoryLocalServiceImpl.java
@@ -196,6 +196,14 @@ public LocalRepository getLocalRepositoryImpl(
 		long repositoryEntryId = getRepositoryEntryId(
 			folderId, fileEntryId, fileVersionId);
 
+		if (repositoryEntryId == folderId) {
+			DLFolder dlFolder = dlFolderLocalService.fetchDLFolder(folderId);
+
+			if ((dlFolder != null) && dlFolder.isMountPoint()) {
+				return getLocalRepositoryImpl(dlFolder.getRepositoryId());
+			}
+		}
+
 		LocalRepository localRepositoryImpl =
 			_localRepositoriesByRepositoryEntryId.get(repositoryEntryId);
 
@@ -271,14 +279,11 @@ public com.liferay.portal.kernel.repository.Repository getRepositoryImpl(
 		long repositoryEntryId = getRepositoryEntryId(
 			folderId, fileEntryId, fileVersionId);
 
-		RepositoryEntry repositoryEntry =
-			repositoryEntryLocalService.fetchRepositoryEntry(repositoryEntryId);
-
-		if ((repositoryEntry == null) && (repositoryEntryId == folderId)) {
-			DLFolder folder = dlFolderLocalService.fetchDLFolder(folderId);
+		if (repositoryEntryId == folderId) {
+			DLFolder dlFolder = dlFolderLocalService.fetchDLFolder(folderId);
 
-			if ((folder != null) && folder.isMountPoint()) {
-				return getRepositoryImpl(folder.getRepositoryId());
+			if ((dlFolder != null) && dlFolder.isMountPoint()) {
+				return getRepositoryImpl(dlFolder.getRepositoryId());
 			}
 		}