Skip to content
This repository was archived by the owner on Oct 18, 2018. It is now read-only.

Commit b46dad3

Browse files
committed
Gracefully handle situation when no file is opened
1 parent 032e5dc commit b46dad3

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/main/java/com/groupdocs/ui/servlet/ListAnnotationsServlet.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,19 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
2323
AnnotationImageHandler imageHandler = Utils.createAnnotationImageHandler();
2424
String filename = request.getParameter("file");
2525

26-
Document doc = Utils.findDocumentByName(filename);
27-
ListAnnotationsResult listResult = imageHandler.getAnnotations(doc.getId());
26+
if (filename != null && !filename.isEmpty()) {
27+
Document doc = Utils.findDocumentByName(filename);
28+
ListAnnotationsResult listResult = imageHandler.getAnnotations(doc.getId());
2829

29-
ArrayList<GetAnnotationResult> list = new ArrayList<>();
30-
for (AnnotationInfo inf : listResult.getAnnotations()) {
31-
list.add(imageHandler.getAnnotation(inf.getGuid()));
32-
}
30+
ArrayList<GetAnnotationResult> list = new ArrayList<>();
31+
for (AnnotationInfo inf : listResult.getAnnotations()) {
32+
list.add(imageHandler.getAnnotation(inf.getGuid()));
33+
}
3334

34-
new ObjectMapper().writeValue(response.getOutputStream(), list);
35+
new ObjectMapper().writeValue(response.getOutputStream(), list);
36+
} else {
37+
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
38+
response.getWriter().print("[]");
39+
}
3540
}
3641
}

0 commit comments

Comments
 (0)