svn commit: r1862874 - in /manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf: crawler/connectors/csws/CswsConnector.java csws/CswsSession.java

[kwright]

Author: kwright
Date: Wed Jul 10 11:10:21 2019
New Revision: 1862874

URL: http://svn.apache.org/viewvc?rev=1862874&view=rev
Log:
Get it to compile

Modified:
    
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
    
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java

Modified: 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1862874&r1=1862873&r2=1862874&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
 Wed Jul 10 11:10:21 2019
@@ -1091,7 +1091,13 @@ public class CswsConnector extends org.a
         
         final ListObjectsThread t = new ListObjectsThread(objID, new 
String[]{"OTDataID", "OTSubTypeString", "OTName"}, filterString, "OTDataID");
         t.start();
-        final List<? extends SGraph> childrenDocs = t.finishUp();
+        final List<? extends SGraph> childrenDocs;
+        try {
+          childrenDocs = t.finishUp();
+        } catch (InterruptedException e) {
+          t.interrupt();
+          throw new ManifoldCFException("Interrupted: 
"+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
+        }
         for (final SGraph childDoc : childrenDocs)
         {
           // Decode results
@@ -3433,7 +3439,7 @@ public class CswsConnector extends org.a
     }
 
     public NodeRights finishUp()
-      throws ManifoldCFException, InterruptedException
+      throws ManifoldCFException, ServiceInterruption, InterruptedException
     {
       join();
       Throwable thr = exception;

Modified: 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java?rev=1862874&r1=1862873&r2=1862874&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
 Wed Jul 10 11:10:21 2019
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.HashMap;
 
 import java.io.OutputStream;
+import java.io.IOException;
 
 import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
@@ -227,6 +228,7 @@ public class CswsSession
         return null;
       }
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -244,6 +246,7 @@ public class CswsSession
         return null;
       }
       processSOAPFault(e);
+      return null;
     }
   }
   
@@ -253,6 +256,7 @@ public class CswsSession
       return getDocumentManagementHandle().getCategoryInheritance(parentId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -262,6 +266,7 @@ public class CswsSession
       return getDocumentManagementHandle().getCategoryDefinitions(categoryIDs, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
   
@@ -272,6 +277,7 @@ public class CswsSession
       return getDocumentManagementHandle().getNode(nodeId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -281,17 +287,18 @@ public class CswsSession
       return getDocumentManagementHandle().getNodeByPath(rootNode, 
colonSeparatedPath, getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
   public NodeRights getNodeRights(final long nodeId) 
     throws ManifoldCFException, ServiceInterruption {
     // Need to detect if object was deleted, and return null in this case!!!
-    // MHL
     try {
       return getDocumentManagementHandle().getNodeRights(nodeId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -301,6 +308,7 @@ public class CswsSession
       return getDocumentManagementHandle().getVersion(nodeId, version, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -310,6 +318,7 @@ public class CswsSession
       return getDocumentManagementHandle().getCategoryDefinition(catId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }      
   }
 
@@ -319,6 +328,7 @@ public class CswsSession
       return getMemberServiceHandle().getUserByLoginName(userName, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -328,6 +338,7 @@ public class CswsSession
       return getMemberServiceHandle().getMemberByLoginName(memberName, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -337,6 +348,7 @@ public class CswsSession
       return getMemberServiceHandle().listMemberOf(memberId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
   
@@ -346,6 +358,7 @@ public class CswsSession
       return getMemberServiceHandle().getMemberById(memberId, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
   
@@ -358,6 +371,8 @@ public class CswsSession
       dataHandler.writeTo(os);
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+    } catch (IOException e) {
+      processIOException(e);
     }
   }
   
@@ -371,6 +386,7 @@ public class CswsSession
       return getMemberServiceHandle().searchForMembers(srchMemOptions, 
getOTAuthentication());
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
 
@@ -388,6 +404,7 @@ public class CswsSession
       return rval;
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
   
@@ -450,6 +467,7 @@ public class CswsSession
       return srp.getItem();
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
+      return null;
     }
   }
                                                 
@@ -489,6 +507,11 @@ public class CswsSession
     return currentAuthToken;
   }
   
+  private void processIOException(IOException e)
+    throws ManifoldCFException, ServiceInterruption {
+    // MHL
+  }
+  
   private void processSOAPFault(SOAPFaultException e)
     throws ManifoldCFException, ServiceInterruption {
     // MHL