Merged revision(s) 1532437 from tomcat/trunk: - Do not use a extra Thread for the room as synchronizing access to the Room's internals should suffice.