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 2013/10/08 23:21:04 UTC
svn commit: r1530428 - in /cxf/branches/2.7.x-fixes: api/
api/src/main/java/org/apache/cxf/service/model/
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/
Author: dkulp
Date: Tue Oct 8 21:21:04 2013
New Revision: 1530428
URL: http://svn.apache.org/r1530428
Log:
Merged revisions 1530419 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1530419 | dkulp | 2013-10-08 16:59:32 -0400 (Tue, 08 Oct 2013) | 2 lines
[CXF-5306] If an out of band header part has the same name as a regular part, there can be confusion as to what get's written out where.
........
Modified:
cxf/branches/2.7.x-fixes/api/pom.xml
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
Modified: cxf/branches/2.7.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/pom.xml?rev=1530428&r1=1530427&r2=1530428&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/api/pom.xml Tue Oct 8 21:21:04 2013
@@ -299,15 +299,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<detectOfflineLinks>false</detectOfflineLinks>
<header>Apache CXF API</header>
@@ -333,6 +324,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -348,6 +348,23 @@
<properties>
<buildnumber.connection.url>scm:git:http://</buildnumber.connection.url>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java?rev=1530428&r1=1530427&r2=1530428&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java Tue Oct 8 21:21:04 2013
@@ -155,11 +155,12 @@ public abstract class AbstractMessageCon
*/
public MessagePartInfo getMessagePart(QName name) {
MessagePartInfo mpi = messageParts.get(name);
- if (mpi == null) {
- for (MessagePartInfo mpi2 : messageParts.values()) {
- if (name.equals(mpi2.getConcreteName())) {
- return mpi2;
- }
+ if (mpi != null) {
+ return mpi;
+ }
+ for (MessagePartInfo mpi2 : messageParts.values()) {
+ if (name.equals(mpi2.getConcreteName())) {
+ return mpi2;
}
}
for (MessagePartInfo mpi2 : getOutOfBandParts()) {
Modified: cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1530428&r1=1530427&r2=1530428&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/branches/2.7.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Tue Oct 8 21:21:04 2013
@@ -582,7 +582,7 @@ public class SoapBindingFactory extends
}
if (minfo == null) {
- minfo = new MessageInfo(null, type, msg.getQName());
+ minfo = new MessageInfo(bop.getOperationInfo(), type, msg.getQName());
}
buildMessage(minfo, msg, schemas, nextId, partName);
@@ -610,8 +610,6 @@ public class SoapBindingFactory extends
}
}
-
-
if (isInput) {
minfo = unwrapped.getInput();
type = MessageInfo.Type.INPUT;
@@ -640,7 +638,7 @@ public class SoapBindingFactory extends
throw new RuntimeException("Problem with WSDL: part element in message "
+ msg.getQName().getLocalPart()
+ " does not specify a name.");
- }
+ }
QName pqname = new QName(minfo.getName().getNamespaceURI(), part.getName());
MessagePartInfo pi = minfo.getMessagePart(pqname);
if (pi != null
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=1530428&r1=1530427&r2=1530428&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Tue Oct 8 21:21:04 2013
@@ -139,10 +139,10 @@ public class WrapperClassInInterceptor e
for (MessagePartInfo part : messageInfo.getMessageParts()) {
if (Boolean.TRUE.equals(part.getProperty(ReflectionServiceFactoryBean.HEADER))) {
MessagePartInfo mpi = wrappedMessageInfo.getMessagePart(part.getName());
- if (lst.hasValue(mpi)) {
+ if (mpi != null && lst.hasValue(mpi)) {
count++;
newParams.put(part, lst.get(mpi));
- } else if (mpi.getTypeClass() == null) {
+ } else if (mpi == null || mpi.getTypeClass() == null) {
//header, but not mapped to a param on the method
if (removes == null) {
removes = new ArrayList<Integer>();