You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2005/07/28 23:55:34 UTC
svn commit: r226262 - in /webservices/axis/trunk/java/modules/addressing:
src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
Author: gdaniels
Date: Thu Jul 28 14:55:29 2005
New Revision: 226262
URL: http://svn.apache.org/viewcvs?rev=226262&view=rev
Log:
Missed a couple
Modified:
webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
Modified: webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=226262&r1=226261&r2=226262&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Jul 28 14:55:29 2005
@@ -148,12 +148,12 @@
public MessageInformationHeaders extractCommonAddressingParameters(
SOAPHeader header,
- MessageInformationHeaders messageInformationHeadersCollection,
+ MessageInformationHeaders messageInformationHeaders,
ArrayList addressingHeaders,
String addressingNamespace)
throws AddressingException {
- if (messageInformationHeadersCollection == null) {
- messageInformationHeadersCollection = new MessageInformationHeaders();
+ if (messageInformationHeaders == null) {
+ messageInformationHeaders = new MessageInformationHeaders();
}
Iterator addressingHeadersIt = addressingHeaders.iterator();
@@ -163,32 +163,32 @@
if (AddressingConstants.WSA_TO.equals(soapHeaderBlock.getLocalName())) {
//here the addressing epr overidde what ever already there is
epr = new EndpointReference(soapHeaderBlock.getText());
- messageInformationHeadersCollection.setTo(epr);
+ messageInformationHeaders.setTo(epr);
} else if (AddressingConstants.WSA_FROM.equals(soapHeaderBlock.getLocalName())) {
- epr = messageInformationHeadersCollection.getFrom();
+ epr = messageInformationHeaders.getFrom();
if (epr == null) {
epr = new EndpointReference("");
- messageInformationHeadersCollection.setFrom(epr);
+ messageInformationHeaders.setFrom(epr);
}
extractEPRAddressInformation(soapHeaderBlock, epr, addressingNamespace);
} else if (AddressingConstants.WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName())) {
- epr = messageInformationHeadersCollection.getReplyTo();
+ epr = messageInformationHeaders.getReplyTo();
if (epr == null) {
epr = new EndpointReference("");
- messageInformationHeadersCollection.setReplyTo(epr);
+ messageInformationHeaders.setReplyTo(epr);
}
extractEPRAddressInformation(soapHeaderBlock, epr, addressingNamespace);
} else if (AddressingConstants.WSA_FAULT_TO.equals(soapHeaderBlock.getLocalName())) {
- epr = messageInformationHeadersCollection.getFaultTo();
+ epr = messageInformationHeaders.getFaultTo();
if (epr == null) {
epr = new EndpointReference("");
- messageInformationHeadersCollection.setFaultTo(epr);
+ messageInformationHeaders.setFaultTo(epr);
}
extractEPRAddressInformation(soapHeaderBlock, epr, addressingNamespace);
} else if (AddressingConstants.WSA_MESSAGE_ID.equals(soapHeaderBlock.getLocalName())) {
- messageInformationHeadersCollection.setMessageId(soapHeaderBlock.getText());
+ messageInformationHeaders.setMessageId(soapHeaderBlock.getText());
} else if (AddressingConstants.WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
- messageInformationHeadersCollection.setAction(soapHeaderBlock.getText());
+ messageInformationHeaders.setAction(soapHeaderBlock.getText());
} else if (AddressingConstants.WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
String address = soapHeaderBlock.getText();
OMAttribute relationshipType =
@@ -204,11 +204,11 @@
relationshipType == null
? relationshipTypeDefaultValue
: relationshipType.getValue());
- messageInformationHeadersCollection.setRelatesTo(relatesTo);
+ messageInformationHeaders.setRelatesTo(relatesTo);
}
}
- return messageInformationHeadersCollection;
+ return messageInformationHeaders;
}
private void extractEPRAddressInformation(
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java?rev=226262&r1=226261&r2=226262&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java Thu Jul 28 14:55:29 2005
@@ -57,25 +57,25 @@
testFileName);
SOAPHeader header = ((SOAPEnvelope) omBuilder.getDocumentElement()).getHeader();
- MessageInformationHeaders messageInformationHeadersCollection =
+ MessageInformationHeaders messageInformationHeaders =
inHandler.extractCommonAddressingParameters(header,
null,
header.getHeaderBlocksWithNSURI(
AddressingConstants.Submission.WSA_NAMESPACE),
AddressingConstants.Submission.WSA_NAMESPACE);
- if (messageInformationHeadersCollection == null) {
+ if (messageInformationHeaders == null) {
fail(
"Addressing Information Headers have not been retrieved properly");
}
assertEquals("action header is not correct",
- messageInformationHeadersCollection.getAction(),
+ messageInformationHeaders.getAction(),
action);
assertEquals("action header is not correct",
- messageInformationHeadersCollection.getMessageId(),
+ messageInformationHeaders.getMessageId(),
messageID);
- assertFromEPR(messageInformationHeadersCollection.getFrom());
+ assertFromEPR(messageInformationHeaders.getFrom());
} catch (Exception e) {
e.printStackTrace();