[ros-diffs] [sginsberg] 39730: - Fix another issue with Portcls release build -- move an assignment outside ASSERT, and ASSERTify the return value by using a local variable