@@ -485,7 +485,7 @@ void Dbtc::execCONTINUEB(Signal* signal)
485485 ApiConnectRecordPtr apiConnectptr;
486486 apiConnectptr.i = scanptr.p->scanApiRec;
487487 ndbrequire(Magic::check_ptr(scanptr.p));
488- c_apiConnectRecordPool.getValidPtr(apiConnectptr);
488+ ndbrequire( c_apiConnectRecordPool.getValidPtr(apiConnectptr) );
489489 sendDihGetNodesLab(signal, scanptr, apiConnectptr);
490490 }
491491 return;
@@ -500,7 +500,7 @@ void Dbtc::execCONTINUEB(Signal* signal)
500500 ApiConnectRecordPtr apiConnectptr;
501501 apiConnectptr.i = scanptr.p->scanApiRec;
502502 ndbrequire(Magic::check_ptr(scanptr.p));
503- c_apiConnectRecordPool.getValidPtr(apiConnectptr);
503+ ndbrequire( c_apiConnectRecordPool.getValidPtr(apiConnectptr) );
504504 sendFragScansLab(signal, scanptr, apiConnectptr);
505505 }
506506 return;
@@ -10216,7 +10216,7 @@ void Dbtc::execSCAN_HBREP(Signal* signal)
1021610216 ApiConnectRecordPtr apiConnectptr;
1021710217 apiConnectptr.i = scanptr.p->scanApiRec;
1021810218 ndbrequire(Magic::check_ptr(scanptr.p));
10219- c_apiConnectRecordPool.getUncheckedPtrRW(apiConnectptr);
10219+ ndbrequire( c_apiConnectRecordPool.getUncheckedPtrRW(apiConnectptr) );
1022010220 Uint32 compare_transid1 = apiConnectptr.p->transid[0] - signal->theData[1];
1022110221 Uint32 compare_transid2 = apiConnectptr.p->transid[1] - signal->theData[2];
1022210222 ndbrequire(Magic::check_ptr(apiConnectptr.p));
@@ -12864,8 +12864,7 @@ void Dbtc::initApiConnectFail(Signal* signal,
1286412864 else
1286512865 {
1286612866 jam();
12867- m_commitAckMarkerPool.seize(tmp);
12868- ndbrequire(tmp.i != RNIL);
12867+ ndbrequire(m_commitAckMarkerPool.seize(tmp));
1286912868 tmp.p->transid1 = transid1;
1287012869 tmp.p->transid2 = transid2;
1287112870 m_commitAckMarkerHash.add(tmp);
@@ -13036,8 +13035,7 @@ void Dbtc::updateApiStateFail(Signal* signal,
1303613035 {
1303713036 jam();
1303813037
13039- m_commitAckMarkerPool.seize(tmp);
13040- ndbrequire(tmp.i != RNIL);
13038+ ndbrequire(m_commitAckMarkerPool.seize(tmp));
1304113039
1304213040 apiConnectptr.p->commitAckMarker = tmp.i;
1304313041 tmp.p->transid1 = transid1;
@@ -17064,8 +17062,7 @@ Dbtc::execDUMP_STATE_ORD(Signal* signal)
1706417062 recordNo++;
1706517063 if (numRecords > 0)
1706617064 {
17067- (void) tcConnectRecord.getUncheckedPtrs(&recordNo, &tc, 1);
17068- if (recordNo != RNIL)
17065+ if (tcConnectRecord.getUncheckedPtrs(&recordNo, &tc, 1))
1706917066 {
1707017067 dumpState->args[0] = DumpStateOrd::TcDumpSetOfTcConnectRec;
1707117068 dumpState->args[1] = recordNo;
@@ -17198,8 +17195,8 @@ Dbtc::execDUMP_STATE_ORD(Signal* signal)
1719817195 }
1719917196
1720017197 numRecords--;
17201- (void) c_apiConnectRecordPool.getUncheckedPtrs(&recordNo, &ap, 1);
17202- if (recordNo != RNIL && numRecords > 0 )
17198+ if (numRecords > 0 &&
17199+ c_apiConnectRecordPool.getUncheckedPtrs(&recordNo, &ap, 1) )
1720317200 {
1720417201 dumpState->args[0] = DumpStateOrd::TcDumpSetOfApiConnectRec;
1720517202 dumpState->args[1] = recordNo;
0 commit comments