Per above, can you change this to "if (containedDataDefinitions == null) { containedDataDefinitions = new HashMap... }; return containedDataDefinitions;