Merged fix for JAXB-596: Map Unmarshaller modifies the map after setting it.