XXX: fallback unknown filetypes to jpeg

code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java

@@ -172,7 +172,20 @@ public class UserRestViewV2 {
             User user = userBean.getUser(userId);
             User user = userBean.getUser(userId);
             UserImage image = user.getCurrentImage();
             UserImage image = user.getCurrentImage();
             //logger.info("Mimetype: " + body.getMediaType());
             //logger.info("Mimetype: " + body.getMediaType());
-            return Response.ok(image.getImageData(), image.getMimeType()).build();
+
+            // XXX: Vectorama2015 - assume image/jpeg if mime type not known
+            String mimeType = image.getMimeType();
+            if (mimeType != null) {
+                if (!mimeType.equals("image/png") && !mimeType.equals("image/gif")) {
+                    // fallback
+                    mimeType = "image/jpeg";
+                }
+            } else {
+                // fallback if null
+                mimeType = "image/jpeg";
+            }
+
+            return Response.ok(image.getImageData(), mimeType).build();
         } catch(Exception e) {
         } catch(Exception e) {
             logger.error("Getting image failed", e);
             logger.error("Getting image failed", e);
             return Response.serverError().entity(PojoUtils.initErrorPojo(e.getMessage())).build();
             return Response.serverError().entity(PojoUtils.initErrorPojo(e.getMessage())).build();