670,673c670,671
< int proc_id = -1;
< if (pkt->req->hasContextId()) {
< proc_id = pkt->req->contextId();
< }
---
> ContextID proc_id = pkt->req->hasContextId() ?
> pkt->req->contextId() : InvalidContextID;