Tries to get the default from the static folder first, if it cannot be found it grabs a backup version from within the jar.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/ad481313 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/ad481313 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/ad481313 Branch: refs/heads/fix/dependendices-2016 Commit: ad4813130854be176751c3b42adc0d51ff37228d Parents: ed8fd86 Author: wisebaldone <ehu...@gmail.com> Authored: Tue Apr 18 20:09:38 2017 +1000 Committer: wisebaldone <ehu...@gmail.com> Committed: Tue Apr 18 20:09:38 2017 +1000 ---------------------------------------------------------------------- .../wave/box/server/rpc/InitialsAvatarsServlet.java | 8 +++++++- .../apache/wave/box/server/rpc/avatar/unknown.jpg | Bin 0 -> 1669 bytes 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/ad481313/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java index 3e63ddf..2df3f83 100644 --- a/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java +++ b/wave/src/main/java/org/apache/wave/box/server/rpc/InitialsAvatarsServlet.java @@ -44,7 +44,13 @@ public final class InitialsAvatarsServlet extends HttpServlet { @Inject public InitialsAvatarsServlet() throws IOException { - DEFAULT = ImageIO.read(Resources.getResource("org/apache/wave/box/server/rpc/InitialsAvatarDefault.jpg")); + try { + DEFAULT = ImageIO.read(Resources.getResource("static/images/avatar/unknown.jpg")); + } catch (Exception e) { + LOG.warning("Default Avatar image could not be loaded from disc. " + e.toString()); + DEFAULT = ImageIO.read(Resources.getResource( + "org/apache/wave/box/server/rpc/avatar/unknown.jpg")); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/ad481313/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg b/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg new file mode 100644 index 0000000..0f39513 Binary files /dev/null and b/wave/src/main/resources/org/apache/wave/box/server/rpc/avatar/unknown.jpg differ
