Author: ningjiang Date: Sat Feb 12 07:29:30 2011 New Revision: 1070038 URL: http://svn.apache.org/viewvc?rev=1070038&view=rev Log: Merged revisions 1070037 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1070037 | ningjiang | 2011-02-12 15:13:36 +0800 (Sat, 12 Feb 2011) | 9 lines Merged revisions 1070034 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1070034 | ningjiang | 2011-02-12 14:52:54 +0800 (Sat, 12 Feb 2011) | 1 line CXF-3332 Fixed the issue of SourceDataBinding doesn't create a thread safe DataReader. ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 12 07:29:30 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254,1069739 -/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720 +/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254,1069739,1070037 +/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java?rev=1070038&r1=1070037&r2=1070038&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java Sat Feb 12 07:29:30 2011 @@ -35,18 +35,8 @@ public class SourceDataBinding extends o public static final String PREFERRED_FORMAT = "source-preferred-format"; - private XMLStreamDataReader xsrReader; - private XMLStreamDataWriter xswWriter; - private NodeDataWriter nodeWriter; - private NodeDataReader nodeReader; - public SourceDataBinding() { super(); - this.xsrReader = new XMLStreamDataReader(); - this.xswWriter = new XMLStreamDataWriter(); - - this.nodeReader = new NodeDataReader(); - this.nodeWriter = new NodeDataWriter(); } public void initialize(Service service) { @@ -57,9 +47,9 @@ public class SourceDataBinding extends o @SuppressWarnings("unchecked") public <T> DataReader<T> createReader(Class<T> cls) { if (cls == XMLStreamReader.class) { - return (DataReader<T>) xsrReader; + return (DataReader<T>) new XMLStreamDataReader(); } else if (cls == Node.class) { - return (DataReader<T>) nodeReader; + return (DataReader<T>) new NodeDataReader(); } else { throw new UnsupportedOperationException("The type " + cls.getName() + " is not supported."); } @@ -72,9 +62,9 @@ public class SourceDataBinding extends o @SuppressWarnings("unchecked") public <T> DataWriter<T> createWriter(Class<T> cls) { if (cls == XMLStreamWriter.class) { - return (DataWriter<T>) xswWriter; + return (DataWriter<T>) new XMLStreamDataWriter(); } else if (cls == Node.class) { - return (DataWriter<T>) nodeWriter; + return (DataWriter<T>) new NodeDataWriter(); } else { throw new UnsupportedOperationException("The type " + cls.getName() + " is not supported."); }
