You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/12/12 21:30:18 UTC
cxf git commit: CXF-6138 JAXB unmarshaller Properties get overwriten
on a call to initialize() Removed some code that isn't necessary This closes
#36
Repository: cxf
Updated Branches:
refs/heads/master 3043bfbe0 -> e47e39411
CXF-6138 JAXB unmarshaller Properties get overwriten on a call to initialize()
Removed some code that isn't necessary
This closes #36
Signed-off-by: Daniel Kulp <dk...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e47e3941
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e47e3941
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e47e3941
Branch: refs/heads/master
Commit: e47e394114d6a3bf06401960618e6bd556a904d7
Parents: 3043bfb
Author: paul <pk...@gmail.com>
Authored: Sat Dec 6 22:04:08 2014 +0000
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 12 15:29:52 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e47e3941/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 38f5cdb..1bb1118 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
@@ -302,16 +302,9 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
return;
}
-
contextClasses = new LinkedHashSet<Class<?>>();
- if (this.getUnmarshallerProperties() == null || this.getUnmarshallerProperties().isEmpty()) {
- Map<String, Object> unmarshallerProps = new HashMap<String, Object>();
- this.setUnmarshallerProperties(unmarshallerProps);
- }
-
for (ServiceInfo serviceInfo : service.getServiceInfos()) {
-
JAXBContextInitializer initializer
= new JAXBContextInitializer(serviceInfo, contextClasses, typeRefs, this.getUnmarshallerProperties());
initializer.walk();