BUG-1281: optimize ListenerAdapter