Merge pull request #12666 from ashera96/master

Fix NPE encountered during API Product export
wso2 · Oct 15, 2024 · a1aeee4 · a1aeee4
2 parents c59caba + 5218aa2
commit a1aeee4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...c/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ExportUtils.java b/...c/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ExportUtils.java
@@ -356,7 +356,12 @@ public static void addThumbnailToArchive(String archivePath, Identifier identifi
  String tenantDomain = RestApiCommonUtil.getLoggedInUserTenantDomain();
  String localImagePath = archivePath + File.separator + ImportExportConstants.IMAGE_RESOURCE;
  try {
- ResourceFile thumbnailResource = apiProvider.getIcon(currentUuid, tenantDomain);
+ ResourceFile thumbnailResource;
+ if (currentUuid == null) {
+ thumbnailResource = apiProvider.getIcon(identifier.getUUID(), tenantDomain);
+ } else {
+ thumbnailResource = apiProvider.getIcon(currentUuid, tenantDomain);
+ }
  if (thumbnailResource != null) {
  String mediaType = thumbnailResource.getContentType();
  String extension = ImportExportConstants.fileExtensionMapping.get(mediaType);