From f3edc221f311d7f16c6ace77b883860515ab75c7 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 20 Sep 2001 17:29:25 +0000
Subject: [PATCH] catch additional exceptions and modified subscription startup
 to work better with local channels

---
 src/ca/access.cpp | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/ca/access.cpp b/src/ca/access.cpp
index 0fda79cc2..aa8299c38 100644
--- a/src/ca/access.cpp
+++ b/src/ca/access.cpp
@@ -317,6 +317,11 @@ extern "C" int epicsShareAPI ca_array_get ( chtype type,
         pNotify->cancel ();
         return ECA_NOTINSERVICE;
     }
+    catch ( cacChannel::requestTimedOut & )
+    {
+        pNotify->cancel ();
+        return ECA_TIMEOUT;
+    }
     catch ( std::bad_alloc & )
     {
         pNotify->cancel ();
@@ -380,6 +385,10 @@ extern "C" int epicsShareAPI ca_array_get_callback ( chtype type,
     {
         return ECA_NOTINSERVICE;
     }
+    catch ( cacChannel::requestTimedOut & )
+    {
+        return ECA_TIMEOUT;
+    }
     catch ( std::bad_alloc & )
     {
         return ECA_ALLOCMEM;
@@ -439,6 +448,10 @@ extern "C" int epicsShareAPI ca_array_put_callback ( chtype type, arrayElementCo
     {
         return ECA_NOTINSERVICE;
     }
+    catch ( cacChannel::requestTimedOut & )
+    {
+        return ECA_TIMEOUT;
+    }
     catch ( std::bad_alloc & )
     {
         return ECA_ALLOCMEM;
@@ -488,6 +501,10 @@ extern "C" int epicsShareAPI ca_array_put ( chtype type, arrayElementCount count
     {
         return ECA_NOTINSERVICE;
     }
+    catch ( cacChannel::requestTimedOut & )
+    {
+        return ECA_TIMEOUT;
+    }
     catch ( std::bad_alloc & )
     {
         return ECA_ALLOCMEM;
@@ -564,17 +581,18 @@ extern "C" int epicsShareAPI ca_add_masked_array_event (
 
     try {
         autoPtrDestroy < oldSubscription > pSubsr
-            ( new oldSubscription  ( 
-            *pChan, tmpType, count, mask, pCallBack, pCallBackArg ) );
-        if ( ! pSubsr.get () ) {
+            ( new oldSubscription  ( *pChan, pCallBack, pCallBackArg ) );
+        if ( pSubsr.get () ) {
+            evid pTmp = pSubsr.release ();
+            if ( monixptr ) {
+                *monixptr = pTmp;
+            }
+            pTmp->begin ( tmpType, count, mask );
+            return ECA_NORMAL;
+        }
+        else {
             return ECA_ALLOCMEM;
         }
-
-        evid pTmp = pSubsr.release ();
-        if ( monixptr ) {
-            *monixptr = pTmp;
-        }
-        return ECA_NORMAL;
     }
     catch ( cacChannel::badType & )
     {