Author: dkulp
Date: Mon Jun 2 10:38:03 2008
New Revision: 662494
URL: http://svn.apache.org/viewvc?rev=662494&view=rev
Log:
Merged revisions 661863 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r661863 | dkulp | 2008-05-30 17:11:55 -0400 (Fri, 30 May 2008) | 2 lines
[CXF-1618] Fix jaxws version of this
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=662494&r1=662493&r2=662494&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Mon Jun 2 10:38:03 2008
@@ -873,8 +873,6 @@
protected void createBareMessage(ServiceInfo serviceInfo,
OperationInfo opInfo, boolean isOut) {
- SchemaInfo schemaInfo = null;
- XmlSchema schema = null;
MessageInfo message = isOut ? opInfo.getOutput() : opInfo.getInput();
if (message.getMessageParts().size() == 0) {
@@ -884,6 +882,9 @@
Method method = (Method)opInfo.getProperty(METHOD);
int paraNumber = 0;
for (MessagePartInfo mpi : message.getMessageParts()) {
+ SchemaInfo schemaInfo = null;
+ XmlSchema schema = null;
+
QName qname = (QName)mpi.getProperty(ELEMENT_NAME);
if (message.getMessageParts().size() == 1) {
qname = qname == null && !isOut ? getInParameterName(opInfo,
method, -1) : qname;
@@ -957,8 +958,6 @@
addImport(schema, mpi.getTypeQName().getNamespaceURI());
}
- schemaInfo.setSchema(schema);
-
mpi.setElement(true);
mpi.setElementQName(qname);
paraNumber++;