Use modifiable maps during JAXB context initialization # Conflicts: # rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/250a498f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/250a498f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/250a498f Branch: refs/heads/2.7.x-fixes Commit: 250a498ffd08d8a42cdaac0200e77363252ead7d Parents: 7bcef9f Author: Daniel Kulp <dk...@apache.org> Authored: Thu May 14 12:29:07 2015 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri May 22 15:26:51 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/250a498f/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java index c26372b..1fc1c64 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java @@ -200,9 +200,9 @@ public class JAXBDataBinding extends AbstractDataBinding Class<?> cls; - private Map<String, Object> contextProperties = Collections.emptyMap(); - private Map<String, Object> marshallerProperties = Collections.emptyMap(); - private Map<String, Object> unmarshallerProperties = Collections.emptyMap(); + private Map<String, Object> contextProperties = new HashMap<String, Object>(); + private Map<String, Object> marshallerProperties = new HashMap<String, Object>(); + private Map<String, Object> unmarshallerProperties = new HashMap<String, Object>(); private Unmarshaller.Listener unmarshallerListener; private Marshaller.Listener marshallerListener; private ValidationEventHandler validationEventHandler;
