svn commit: r1491844 - /manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java

[kw...@apache.org]

Author: kwright
Date: Tue Jun 11 15:44:18 2013
New Revision: 1491844

URL: http://svn.apache.org/r1491844
Log:
Fix NPE; no ticket number yet.

Modified:
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1491844&r1=1491843&r2=1491844&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Tue Jun 11 15:44:18 2013
@@ -1265,7 +1265,10 @@ public class LivelinkAuthority extends o
       this.serverHTTPNTLMDomain = (serverHTTPNTLMDomain==null)?"":serverHTTPNTLMDomain;
       this.serverHTTPNTLMUsername = (serverHTTPNTLMUsername==null)?"":serverHTTPNTLMUsername;
       this.serverHTTPNTLMPassword = (serverHTTPNTLMPassword==null)?"":serverHTTPNTLMPassword;
-      this.serverHTTPSKeystore = serverHTTPSKeystore.getString();
+      if (serverHTTPSKeystore != null)
+        this.serverHTTPSKeystore = serverHTTPSKeystore.getString();
+      else
+        this.serverHTTPSKeystore = null;
       this.responseLifetime = responseLifetime;
     }
 
@@ -1281,7 +1284,7 @@ public class LivelinkAuthority extends o
       return getClass().getName() + "-" + userName + "-" + serverProtocol + "-" + serverName +
         "-" + Integer.toString(serverPort) + "-" + serverUsername + "-" + serverPassword +
         "-" + serverHTTPCgi + "-" + serverHTTPNTLMDomain + "-" + serverHTTPNTLMUsername +
-        "-" + serverHTTPNTLMPassword + "-" + serverHTTPSKeystore;
+        "-" + serverHTTPNTLMPassword + "-" + ((serverHTTPSKeystore==null)?"":serverHTTPSKeystore);
     }
 
     /** Return the object expiration interval */
@@ -1298,7 +1301,7 @@ public class LivelinkAuthority extends o
         serverProtocol.hashCode() + serverName.hashCode() + new Integer(serverPort).hashCode() +
         serverUsername.hashCode() + serverPassword.hashCode() +
         serverHTTPCgi.hashCode() + serverHTTPNTLMDomain.hashCode() + serverHTTPNTLMUsername.hashCode() +
-        serverHTTPNTLMPassword.hashCode() + serverHTTPSKeystore.hashCode();
+        serverHTTPNTLMPassword.hashCode() + ((serverHTTPSKeystore==null)?0:serverHTTPSKeystore.hashCode());
     }
     
     public boolean equals(Object o)
@@ -1311,7 +1314,8 @@ public class LivelinkAuthority extends o
         ard.serverUsername.equals(serverUsername) && ard.serverPassword.equals(serverPassword) &&
         ard.serverHTTPCgi.equals(serverHTTPCgi) && ard.serverHTTPNTLMDomain.equals(serverHTTPNTLMDomain) &&
         ard.serverHTTPNTLMUsername.equals(serverHTTPNTLMUsername) && ard.serverHTTPNTLMPassword.equals(serverHTTPNTLMPassword) &&
-        ard.serverHTTPSKeystore.equals(serverHTTPSKeystore);
+        ((ard.serverHTTPSKeystore != null && serverHTTPSKeystore != null && ard.serverHTTPSKeystore.equals(serverHTTPSKeystore)) ||
+          ((ard.serverHTTPSKeystore == null || serverHTTPSKeystore == null) && ard.serverHTTPSKeystore == serverHTTPSKeystore));
     }
     
   }