Return empty list if an error has occured.

Author: milanmajchrak

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataBitstreamRestRepository.java

@@ -102,25 +102,30 @@ public Page<MetadataBitstreamWrapperRest> findByHandle(@Parameter(value = "handl
 
             for (Bitstream bitstream : bitstreams) {
                 String url = previewContentService.composePreviewURL(context, item, bitstream, contextPath);
-                List<FileInfo> fileInfos = null;
+                List<FileInfo> fileInfos = new ArrayList<>();
                 boolean canPreview = previewContentService.canPreview(context, bitstream);
                 if (canPreview) {
-                    List<PreviewContent> prContents = previewContentService.hasPreview(context, bitstream);
-                    // Generate new content if we didn't find any
-                    if (prContents.isEmpty()) {
-                        fileInfos = previewContentService.getFilePreviewContent(context, bitstream);
-                        // Do not store HTML content in the database because it could be longer than the limit
-                        // of the database column
-                        if (!StringUtils.equals("text/html", bitstream.getFormat(context).getMIMEType())) {
-                            for (FileInfo fi : fileInfos) {
-                                previewContentService.createPreviewContent(context, bitstream, fi);
+                    try {
+                        List<PreviewContent> prContents = previewContentService.hasPreview(context, bitstream);
+                        // Generate new content if we didn't find any
+                        if (prContents.isEmpty()) {
+                            fileInfos = previewContentService.getFilePreviewContent(context, bitstream);
+                            // Do not store HTML content in the database because it could be longer than the limit
+                            // of the database column
+                            if (!StringUtils.equals("text/html", bitstream.getFormat(context).getMIMEType())) {
+                                for (FileInfo fi : fileInfos) {
+                                    previewContentService.createPreviewContent(context, bitstream, fi);
+                                }
+                            }
+                        } else {
+                            fileInfos = new ArrayList<>();
+                            for (PreviewContent pc : prContents) {
+                                fileInfos.add(previewContentService.createFileInfo(pc));
                             }
                         }
-                    } else {
-                        fileInfos = new ArrayList<>();
-                        for (PreviewContent pc : prContents) {
-                            fileInfos.add(previewContentService.createFileInfo(pc));
-                        }
+                    } catch (Exception e) {
+                        log.error("Cannot create preview content for bitstream: {} because: {}",
+                                bitstream.getID(), e.getMessage());
                     }
                 }
                 MetadataBitstreamWrapper bts = new MetadataBitstreamWrapper(bitstream, fileInfos,