manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1208226 - in /incubator/lcf/trunk: CHANGES.txt connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Date Wed, 30 Nov 2011 02:54:40 GMT
Author: kwright
Date: Wed Nov 30 02:54:39 2011
New Revision: 1208226

URL: http://svn.apache.org/viewvc?rev=1208226&view=rev
Log:
Fix for CONNECTORS-298.  Fix the error message when trust configuration is likely to be the
problem.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1208226&r1=1208225&r2=1208226&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Nov 30 02:54:39 2011
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-298: Improve the SSL error message when no trusted
+certs are found.
+(Michael Kelleher, Karl Wright)
+
 CONNECTORS-297: Add a description of ant download-dependencies for
 Building the SharePoint connector to how-to-build-and-deploy.html.
 (Shinichiro Abe)

Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1208226&r1=1208225&r2=1208226&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
(original)
+++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Wed Nov 30 02:54:39 2011
@@ -1555,6 +1555,15 @@ public class ThrottledFetcher
           throw new ServiceInterruption("Timed out waiting for a connection for '"+myUrl+"':
"+e.getMessage(), e, currentTime + TIME_2HRS,
             currentTime + TIME_6HRS,-1,false);
         }
+        catch (javax.net.ssl.SSLException e)
+        {
+          // Probably this is an incorrectly configured trust store
+          throwable = new ManifoldCFException("SSL handshake error: "+e.getMessage()+"; check
your connection's Certificate configuration",e);
+          statusCode = FETCH_IO_ERROR;
+          if (recordEverything)
+            dataSession.setResponseCode(statusCode);
+          return;
+        }
         catch (IOException e)
         {
           // Treat this as a bad url.  We don't know what happened, but it isn't something
we are going to naively



Mime
View raw message