Merge commit 'pwrutv_x470/master'

c149dd15 · Claes Sjofors · 56365c7c · 1fdc3954 · c149dd15
Commit c149dd15 authored Jul 02, 2009 by Claes Sjofors
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

opc/exe/opc_provider/src/opc_provider.cpp opc/exe/opc_provider/src/opc_provider.cpp +9 -7

No files found.
--- a/opc/exe/opc_provider/src/opc_provider.cpp
+++ b/opc/exe/opc_provider/src/opc_provider.cpp
@@ -962,6 +962,7 @@ void opc_provider::subAssociateBuffer( co_procom *pcom, void **buff, int oix, in
 	opcprv_sub sub;

 	server_state->RequestCnt++;
+	if ( subscribe_response.ServerSubHandle) {
 	  sub.handle = *subscribe_response.ServerSubHandle;
 	  sub.oix = oix;
 	  m_sublist[sid.rix] = sub;
@@ -972,6 +973,7 @@ void opc_provider::subAssociateBuffer( co_procom *pcom, void **buff, int oix, in
 	    }
 	  }
 	}
+      }
      else {
 	// Error returned from soap
 	server_state->RequestCnt++;