commit 3ff89c024fe51ff6edf4faa1fa53f75b531ee796
author Marc Kriguer <myk@google.com> Wed Apr 09 11:05:17 2014 -0700
committer Marc Kriguer <myk@google.com> Wed Apr 09 11:05:17 2014 -0700
tree 917f179d4e964292a581ba9e34485c65c2325ffe
parent d0feaf1235f23319cbc20ebc23663df569020f17

Fix broken AdAdaptor NPE on init

when per-server password is not specified

src/com/google/enterprise/adaptor/ad/AdAdaptor.java

diff --git a/src/com/google/enterprise/adaptor/ad/AdAdaptor.java b/src/com/google/enterprise/adaptor/ad/AdAdaptor.java
index 0a0c899..70ba0e0 100644
--- a/src/com/google/enterprise/adaptor/ad/AdAdaptor.java
+++ b/src/com/google/enterprise/adaptor/ad/AdAdaptor.java
@@ -122,10 +122,11 @@
       if (principal.isEmpty()) {
         throw new IllegalStateException("user not specified for host " + host);
       }
-      String passwd = context.getSensitiveValueDecoder().decodeValue(
-          singleServerConfig.get("password"));
+      String passwd = singleServerConfig.get("password");
       if (null == passwd) {
         passwd = defaultPassword;
+      } else {
+        passwd = context.getSensitiveValueDecoder().decodeValue(passwd);
       }
       if (passwd.isEmpty()) {
         throw new IllegalStateException("password not specified for host "