Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

dependencies update

Browse Source
This commit is contained in:
Athou
2013-03-31 11:57:50 +02:00
parent d3bcedb9f0
commit 6d971fa3f3
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -119,13 +119,11 @@ public class SubscriptionsREST extends AbstractREST {
@POST
@Path("import")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@SuppressWarnings("unchecked")
public Response importOpml() {
try {
FileItemFactory factory = new DiskFileItemFactory(1000000, null);
ServletFileUpload upload = new ServletFileUpload(factory);
List<FileItem> items = upload.parseRequest(request);
for (FileItem item : items) {
for (FileItem item : upload.parseRequest(request)) {
if ("file".equals(item.getFieldName())) {
opmlImporter.importOpml(getUser(),
IOUtils.toString(item.getInputStream(), "UTF-8"));
@@ -133,7 +131,9 @@ public class SubscriptionsREST extends AbstractREST {
}
}
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
throw new WebApplicationException(Response
.status(Status.INTERNAL_SERVER_ERROR)
.entity(e.getMessage()).build());
}
return Response.ok(Status.OK).build();
}