LPS-41782 use correct loop to continue, fix glassfish
LPS-41782 Source formatting