[RJ-Server] Fix potential issue in RJ-Com

Backport-of: 69a8ceb7028fc361a4615b21505752c49c04e7da
2 files changed