Commit 7c1572de authored by unknown's avatar unknown
Browse files

corrected manual merge

parent 0b60b1d3
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,8 @@ SignalSender::sendSignal(Uint16 nodeId, const SimpleSignal * s){
    signalLogger.flushSignalLog();
  }
#endif
  
  assert(getNodeInfo(nodeId).m_api_reg_conf == true ||
         s->readSignalNumber() == GSN_API_REGREQ);
  return theFacade->theTransporterRegistry->prepareSend(&s->header,
							1, // JBB
							&s->theData[0],