| commit | 73a12e084e2edf551ceaa765482f76ac60e722a0 | [log] [tgz] |
|---|---|---|
| author | Orgad Shaneh <orgads@gmail.com> | Tue Apr 18 16:43:09 2017 +0300 |
| committer | David Pursehouse <dpursehouse@collab.net> | Tue Apr 25 05:51:08 2017 +0000 |
| tree | 65cce99d056cca7d16a87b89f2e94938db6a71df | |
| parent | 89438b1acb29c9aafeee2b96fb4dc2a5a4144a52 [diff] | |
| parent | f3d8d2c98acb22592f56ccb3b4da4ad3563aeea1 [diff] |
Merge branch 'stable-2.13' * stable-2.13: Fix yet another null pointer exception Change-Id: Id2b163aee90705c9359e6e5e5d2469e9224f9989
diff --git a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java index 056a1f2..bf7143c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java +++ b/src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java
@@ -114,7 +114,8 @@ */ private String replaceInUrl(String placeholder, String url, String replacement) { - if (url == null || !url.contains(placeholder)) { + if (url == null || replacement == null + || !url.contains(placeholder)) { return url; }