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 2007/12/15 03:41:08 UTC
svn commit: r604374 - in /incubator/cxf/branches/2.0.x-fixes: ./
api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
Author: dkulp
Date: Fri Dec 14 18:41:07 2007
New Revision: 604374
URL: http://svn.apache.org/viewvc?rev=604374&view=rev
Log:
Merged revisions 604372 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r604372 | bimargulies | 2007-12-14 21:23:07 -0500 (Fri, 14 Dec 2007) | 2 lines
Fix CXF-1294.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
incubator/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java?rev=604374&r1=604373&r2=604374&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java Fri Dec 14 18:41:07 2007
@@ -87,7 +87,11 @@
* @param part the message part.
*/
public void addMessagePart(MessagePartInfo part) {
- part.setIndex(messageParts.size());
+ if (messageParts.containsKey(part.getName())) {
+ part.setIndex(messageParts.get(part.getName()).getIndex());
+ } else {
+ part.setIndex(messageParts.size());
+ }
messageParts.put(part.getName(), part);
}
Modified: incubator/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java?rev=604374&r1=604373&r2=604374&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java Fri Dec 14 18:41:07 2007
@@ -50,6 +50,7 @@
messageInfo.addMessagePart(qname);
assertEquals(messageInfo.getMessageParts().size(), 1);
MessagePartInfo messagePartInfo = messageInfo.getMessagePart(qname);
+ int indexAssigned = messagePartInfo.getIndex();
assertEquals(messagePartInfo.getName().getLocalPart(), "testMessagePart");
assertEquals(messagePartInfo.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
@@ -59,6 +60,7 @@
messageInfo.addMessagePart(messagePartInfo);
//add two same part, so size is still 1
assertEquals(messageInfo.getMessageParts().size(), 1);
+ assertEquals(indexAssigned, messagePartInfo.getIndex());
messagePartInfo = new MessagePartInfo(new QName(
"http://apache.org/hello_world_soap_http", "testMessagePart2"), messageInfo);
messageInfo.addMessagePart(messagePartInfo);