chore: include hotfix-18014 (#26144)

dotCMS · Sep 17, 2023 · 606d358 · 606d358
1 parent 1660f8c
commit 606d358
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/FileTool.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/viewtools/FileTool.java
@@ -12,6 +12,7 @@
 import com.dotmarketing.portlets.fileassets.business.IFileAsset;
 import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI;
 import com.dotmarketing.util.InodeUtils;
+import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.UtilMethods;
 
 import org.apache.velocity.tools.view.tools.ViewTool;
@@ -34,6 +35,11 @@ public IFileAsset getFile(String identifier, boolean live, long languageId) thro
 		Identifier id = identifierAPI.find(identifier);
 		ContentletVersionInfo  cvi = APILocator.getVersionableAPI().getContentletVersionInfo(id.getId(), languageId);
 	    String conInode = (!live) ? cvi.getWorkingInode() : cvi.getLiveInode();
+		if (!UtilMethods.isSet(conInode)) {
+			Logger.velocityWarn(FileTool.class, "There's not a live version for the file asset "
+					+ " id: " + identifier + ", lang: " + languageId);
+			return null;
+		}
 	    FileAsset file  = APILocator.getFileAssetAPI().fromContentlet(APILocator.getContentletAPI().find(conInode,  userAPI.getSystemUser(), false));
 	    return file;
 	}