svn commit: r1863167 - /manifoldcf/branches/CONNECTORS-1566/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java

[kwright]

Author: kwright
Date: Tue Jul 16 17:28:44 2019
New Revision: 1863167

URL: http://svn.apache.org/viewvc?rev=1863167&view=rev
Log:
More work

Modified:
    
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/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=1863167&r1=1863166&r2=1863167&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
 Tue Jul 16 17:28:44 2019
@@ -197,6 +197,8 @@ public class CswsSession
         this.rootNodeTypes = 
getDocumentManagementHandle().getRootNodeTypes(getOTAuthentication());
       } catch (SOAPFaultException e) {
         processSOAPFault(e);
+      } catch (javax.xml.ws.WebServiceException e) {
+        processWSException(e);
       }
     }
     return this.rootNodeTypes;
@@ -213,6 +215,8 @@ public class CswsSession
         thisWorkspaceNode = 
getDocumentManagementHandle().getRootNode(nodeType, getOTAuthentication());
       } catch (SOAPFaultException e) {
         processSOAPFault(e);
+      } catch (javax.xml.ws.WebServiceException e) {
+        processWSException(e);
       }
       workspaceTypeNodes.put(nodeType, thisWorkspaceNode);
     }
@@ -229,6 +233,9 @@ public class CswsSession
       }
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -247,6 +254,9 @@ public class CswsSession
       }
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
   
@@ -257,6 +267,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -267,6 +280,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
   
@@ -278,6 +294,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -288,6 +307,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -299,6 +321,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -309,6 +334,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -319,6 +347,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }      
   }
 
@@ -329,6 +360,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -339,6 +373,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -349,6 +386,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
   
@@ -359,6 +399,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
   
@@ -373,6 +416,8 @@ public class CswsSession
       processSOAPFault(e);
     } catch (IOException e) {
       processIOException(e);
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
     }
   }
   
@@ -387,6 +432,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
 
@@ -405,6 +453,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
   
@@ -468,6 +519,9 @@ public class CswsSession
     } catch (SOAPFaultException e) {
       processSOAPFault(e);
       return null;
+    } catch (javax.xml.ws.WebServiceException e) {
+      processWSException(e);
+      return null;
     }
   }
                                                 
@@ -501,6 +555,8 @@ public class CswsSession
         currentAuthToken = authClientHandle.authenticateUser(userName, 
password);
       } catch (SOAPFaultException e) {
         processSOAPFault(e);
+      } catch (javax.xml.ws.WebServiceException e) {
+        processWSException(e);
       }
       currentSessionExpiration = currentTime + sessionExpirationInterval;
     }
@@ -509,11 +565,18 @@ public class CswsSession
   
   private void processIOException(IOException e)
     throws ManifoldCFException, ServiceInterruption {
+    throw new ManifoldCFException("IO exception: "+e.getMessage(), e);
     // MHL
   }
   
   private void processSOAPFault(SOAPFaultException e)
     throws ManifoldCFException, ServiceInterruption {
+    throw new ManifoldCFException("SOAP exception: "+e.getMessage(), e);
     // MHL
   }
+  
+  private void processWSException(javax.xml.ws.WebServiceException e)
+    throws ManifoldCFException, ServiceInterruption {
+    throw new ManifoldCFException("Web service communication issue: 
"+e.getMessage(), e);
+  }
 }