You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2019/01/07 09:21:47 UTC

svn commit: r1850620 - /manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java

Author: kwright
Date: Mon Jan  7 09:21:47 2019
New Revision: 1850620

URL: http://svn.apache.org/viewvc?rev=1850620&view=rev
Log:
Fix UI NPE reported for Web Connector.

Modified:
    manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java

Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1850620&r1=1850619&r2=1850620&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java (original)
+++ manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java Mon Jan  7 09:21:47 2019
@@ -1698,7 +1698,12 @@ public class WebcrawlerConnector extends
         if(trustEverything == "false")
         {
           String trustStore = cn.getAttributeValue(WebcrawlerConfig.ATTR_TRUSTSTORE);
-          IKeystoreManager localTruststore = KeystoreManagerFactory.make("",trustStore);
+          IKeystoreManager localTruststore;
+          if (trustStore == null) {
+              localTruststore = KeystoreManagerFactory.make("");
+          } else {
+              localTruststore = KeystoreManagerFactory.make("",trustStore);
+          }
           String[] truststoreContents = localTruststore.getContents();
 
           // Each trust store will have only at most one cert in it at this level.  These individual certs are assembled into the proper trust store