commit f3d8d2c98acb22592f56ccb3b4da4ad3563aeea1
author Orgad Shaneh <orgads@gmail.com> Thu Dec 01 18:13:54 2016 +0200
committer Orgad Shaneh <orgads@gmail.com> Thu Dec 01 18:13:54 2016 +0200
tree d565e76fd402c5e011e335864fe218c6affb7254
parent fc96372c792b4d61838f6ccc403f1d434c1d2b02

Fix yet another null pointer exception

Change-Id: I01d1beffd7038f34b5e63dc4faee495ef2266693

src/main/java/com/googlesource/gerrit/plugins/avatars/external/ExternalUrlAvatarProvider.java

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;
     }