rpcClient fixed

pvAccessApp/rpcClient/rpcClient.cpp

@@ -97,7 +97,7 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
         }
     }
 
-    virtual void requestDone (const epics::pvData::Status &status, epics::pvData::PVStructure::shared_pointer const &pvResponse)
+    virtual void requestDone(const epics::pvData::Status &status, epics::pvData::PVStructure::shared_pointer const &pvResponse)
     {
         if (status.isSuccess())
         {
@@ -112,23 +112,22 @@ class ChannelRPCRequesterImpl : public ChannelRPCRequester
                 Lock lock(m_pointerMutex);
 
                 response = pvResponse;
-                // this is OK since calle holds also owns it
+                // this is OK since calle holds reference to it
                 m_channelRPC.reset();                
             }
             
-            m_event.signal();
-            
         }
         else
         {
             std::cerr << "[" << m_channelName << "] failed to RPC: " << status.toString() << std::endl;
             {
                 Lock lock(m_pointerMutex);
-                // this is OK since caller holds also owns it
+                // this is OK since calle holds reference to it
                 m_channelRPC.reset();
             }
         }
         
+        m_event.signal();
     }
     
     /*
@@ -244,8 +243,6 @@ PVStructure::shared_pointer RPCClientImpl::request(PVStructure::shared_pointer p
 
     bool allOK = true;
 
-    //ClientFactory::start();
-
     if (m_connected || connect(timeOut))
     {
         shared_ptr<ChannelRPCRequesterImpl> rpcRequesterImpl(new ChannelRPCRequesterImpl(m_channel->getChannelName()));
@@ -275,8 +272,6 @@ PVStructure::shared_pointer RPCClientImpl::request(PVStructure::shared_pointer p
         throw epics::pvAccess::RPCRequestException(Status::STATUSTYPE_ERROR, errMsg);
     }
 
-    //ClientFactory::stop();
-
     if (!allOK)
     {
         throw epics::pvAccess::RPCRequestException(Status::STATUSTYPE_ERROR, "RPC request failed");
@@ -289,6 +284,8 @@ PVStructure::shared_pointer RPCClientImpl::request(PVStructure::shared_pointer p
 
 RPCClient::shared_pointer RPCClientFactory::create(const std::string & serviceName)
 {
+    ClientFactory::start();
+    
     return RPCClient::shared_pointer(new RPCClientImpl(serviceName));
 }
 

pvAccessApp/rpcClient/rpcClient.h

@@ -19,6 +19,8 @@
 #	undef rpcClientEpicsExportSharedSymbols
 #endif
 
+#include <pv/rpcService.h>
+
 #include <shareLib.h>
 
 namespace epics
@@ -43,6 +45,7 @@ namespace pvAccess
 	     * @param  pvArgument  the argument for the rpc
 	     * @param  timeout     the time in seconds to wait for the response
 	     * @return             request response.
+	     * @throws RPCRequestException exception thrown on error on timeout.
 	     */
         virtual epics::pvData::PVStructure::shared_pointer request(epics::pvData::PVStructure::shared_pointer pvRequest,
             double timeOut) = 0;
@@ -67,11 +70,11 @@ namespace pvAccess
     /**
      * Performs complete blocking RPC call, opening a channel and connecting to the
      * service and sending the request.
-     * The PVStructure sent on connection is null.
      *
      * @param  serviceName         the name of the service to connect to
      * @param  request             the request sent to the service
      * @return                     the result of the RPC call.
+	 * @throws RPCRequestException exception thrown on error on timeout.
      */
     epics::pvData::PVStructure::shared_pointer sendRequest(const std::string & serviceName,
         epics::pvData::PVStructure::shared_pointer request, double timeOut);