Roger Dearnaley as you already have the fix, maybe you could create a pull request against master?

A few comments:

• for the first change, let's use putIfAbsent and remove the put call;
• for the third one, rather than using resultSets = Collections.EMPTY_SET;, I would just add a condition resultSets == null to the if statement below.

Other than that, it looks very good.