LPS-44499 Prevent java.lang.UnsupportedOperationException

Hi Marcellus,

I don't know if there are any reason of use the Collections$UnmodifiableMap, but in line 694 we change the value of the map and we get the following exception:

java.lang.UnsupportedOperationException
        at java.util.Collections$UnmodifiableMap.put(Collections.java:1342)

I've changed the return to simple return the map, Are there any reason for use the Collections$UnmodifiableMap?

Regards,

Eudaldo.