making a static class that might have led to race conditions non-static
Authored by: vsp_nagel 2014-01-23
Parent: [r27585]
Child: [r27587]