Experimental Physics and
Industrial Control System

"Hill, Jeff" <[email protected]> · Thu, 17 Oct 2013 15:59:38 +0000

Hi Bruce,

I pushed this fix up to R3.14 in Launchpad this morning. There were some error messages from Bazaar when I did the push, but after inspecting the source on the web in Launchpad I believe that my push was successful.

Jeff

C:\hill\epicsInBazaar\R3.14-mirrorII>bzr push
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Working tree "C:/hill/epicsInBazaar/R3.14-mirrorII/" has uncommitted changes (See bzr status). Uncommitted changes will not be pushed.
bzr: ERROR: Invalid url supplied to transport: "file:///home/phoebus3/ANJ/epics/base/export/base.bzr/trunk/": Win32 file urls start with file:///x:/, where x is a valid drive letter

C:\hill\epicsInBazaar\R3.14-mirrorII>bzr push https://launchpad.net/epics-base/3.14
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Working tree "C:/hill/epicsInBazaar/R3.14-mirrorII/" has uncommitted changes (See bzr status). Uncommitted changes will not be pushed.
bzr: ERROR: Invalid http response for https://launchpad.net/epics-base/3.14/.bzr/checkout/format: Bad status line received: BadStatusLine('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">\n',)

=== modified file src/cas/generic/casStrmClient.cc

--- src/cas/generic/casStrmClient.cc	2012-11-30 23:42:47 +0000
+++ src/cas/generic/casStrmClient.cc	2013-10-17 15:23:47 +0000
@@ -884,7 +884,7 @@
             }
             else {
                 ecaStatus = ECA_GETFAIL;
-            }                
+            }               
             return monitorFailureResponse ( guard, msg, ecaStatus );
         }
         else {
@@ -926,6 +926,7 @@
     int cacStatus = caNetConvert ( 
         msg.m_dataType, pPayload, pPayload, true, msg.m_count );
     if ( cacStatus != ECA_NORMAL ) {
+        pDBRDD->unreference ();
         return this->sendErrWithEpicsStatus ( 
             guard, & msg, chan.getCID(), S_cas_internal, cacStatus );
     }




Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System