cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alessio Soldano <asold...@redhat.com>
Subject Fwd: [5/6] cxf git commit: Use modifiable maps during JAXB context initialization
Date Fri, 15 May 2015 10:08:45 GMT
How about cherry-picking 
https://github.com/apache/cxf/commit/e47e394114d6a3bf06401960618e6bd556a904d7 
into 3.0.x-fixes then?
With the maps being modifiable ones, it looks like we don't really need 
to create a new map for the unmarshallerProperties each time the 
JAXBDataBinding is initialized.

Cheers
Alessio

-------- Original Message --------
Subject: 	[5/6] cxf git commit: Use modifiable maps during JAXB context 
initialization
Date: 	Thu, 14 May 2015 19:33:08 -0000
From: 	dkulp@apache.org
Reply-To: 	dev@cxf.apache.org
To: 	commits@cxf.apache.org



Use modifiable maps during JAXB context initialization


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6db98b2e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6db98b2e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6db98b2e

Branch: refs/heads/3.0.x-fixes
Commit: 6db98b2e3801390562b81e345cb2aab3700bed4e
Parents: 0806c75
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu May 14 12:29:07 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu May 14 15:15:22 2015 -0400

----------------------------------------------------------------------
  .../src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java   | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6db98b2e/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 b624d8a..a034def 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
@@ -195,10 +195,10 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
  
      Class<?> cls;
  
-    private Map<String, Object> contextProperties = Collections.emptyMap();
-    private List<XmlAdapter<?, ?>> adapters = Collections.emptyList();
-    private Map<String, Object> marshallerProperties = Collections.emptyMap();
-    private Map<String, Object> unmarshallerProperties = Collections.emptyMap();
+    private Map<String, Object> contextProperties = new HashMap<String, Object>();
+    private List<XmlAdapter<?, ?>> adapters = new ArrayList<XmlAdapter<?,
?>>();
+    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;




Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message