| commit | 77fff9e4a92e68c64391e16f72997689d000a0ec | [log] [tgz] |
|---|---|---|
| author | Orgad Shaneh <orgads@gmail.com> | Tue Nov 22 15:08:24 2016 +0200 |
| committer | Orgad Shaneh <orgads@gmail.com> | Tue Nov 22 15:08:24 2016 +0200 |
| tree | bd68f11038e1019e6b12fb9445e0eb736376e4b0 | |
| parent | 9b3e5c68b8e396a55589e2278ddb9bb72f2fa63f [diff] | |
| parent | fc96372c792b4d61838f6ccc403f1d434c1d2b02 [diff] |
Merge branch 'stable-2.13' * stable-2.13: Add null protection Change-Id: I2d3d22da7147b3b5c5da395d362c85e693d3dc98
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 ca5444f..056a1f2 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,7 @@ */ private String replaceInUrl(String placeholder, String url, String replacement) { - if (!url.contains(placeholder)) { + if (url == null || !url.contains(placeholder)) { return url; }