You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2006/06/02 08:21:43 UTC
svn commit: r411064 -
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
Author: chinthaka
Date: Thu Jun 1 23:21:43 2006
New Revision: 411064
URL: http://svn.apache.org/viewvc?rev=411064&view=rev
Log:
Fixing yet another bug in toOM method
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java?rev=411064&r1=411063&r2=411064&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Thu Jun 1 23:21:43 2006
@@ -133,7 +133,6 @@
/**
- *
* @param omAttribute
*/
public void addAttribute(OMAttribute omAttribute) {
@@ -199,12 +198,17 @@
public void fromOM(OMElement eprOMElement) {
setAddress(eprOMElement.getFirstChildWithName(new QName("Address")).getText());
- Iterator refParams = eprOMElement.getChildrenWithName(new QName("ReferenceParameters"));
- while (refParams.hasNext()) {
- OMElement omElement = (OMElement) refParams.next();
- addReferenceParameter(omElement);
+ OMElement refParamElement = eprOMElement.getFirstChildWithName(new QName(AddressingConstants.EPR_REFERENCE_PARAMETERS));
+
+ if (refParamElement != null) {
+ Iterator refParams = refParamElement.getChildElements();
+ while (refParams.hasNext()) {
+ OMElement omElement = (OMElement) refParams.next();
+ addReferenceParameter(omElement);
+ }
}
+
OMElement metaDataElement = eprOMElement.getFirstChildWithName(new QName("MetaData"));
if (metaDataElement != null) {
Iterator children = metaDataElement.getChildren();
@@ -227,33 +231,33 @@
}
}
- public OMElement toOM(String nsurl,String localName,String prefix) throws AxisFault{
+ public OMElement toOM(String nsurl, String localName, String prefix) throws AxisFault {
OMFactory fac = OMAbstractFactory.getOMFactory();
- if(prefix!=null){
- OMNamespace wrapNs = fac.createOMNamespace(nsurl,prefix);
- OMElement epr = fac.createOMElement(localName,wrapNs);
- OMNamespace wsaNS = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE,AddressingConstants.WSA_DEFAULT_PREFIX);
- OMElement addressE = fac.createOMElement(AddressingConstants.EPR_ADDRESS,wsaNS,epr);
+ if (prefix != null) {
+ OMNamespace wrapNs = fac.createOMNamespace(nsurl, prefix);
+ OMElement epr = fac.createOMElement(localName, wrapNs);
+ OMNamespace wsaNS = fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_DEFAULT_PREFIX);
+ OMElement addressE = fac.createOMElement(AddressingConstants.EPR_ADDRESS, wsaNS, epr);
addressE.setText(address);
- OMElement metadataE = fac.createOMElement(AddressingConstants.Final.WSA_METADATA,wsaNS,epr);
+ OMElement metadataE = fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr);
- if(this.metaData != null){
+ if (this.metaData != null) {
Iterator metadata = this.metaData.iterator();
- while(metadata.hasNext()){
- metadataE.addChild((OMNode)metadata.next());
+ while (metadata.hasNext()) {
+ metadataE.addChild((OMNode) metadata.next());
}
}
- if(this.referenceParameters != null){
- OMElement refParameterElement = fac.createOMElement(AddressingConstants.Final.WSA_METADATA, wsaNS, epr);
+ if (this.referenceParameters != null) {
+ OMElement refParameterElement = fac.createOMElement(AddressingConstants.EPR_REFERENCE_PARAMETERS, wsaNS, epr);
Iterator refParms = referenceParameters.values().iterator();
- while(refParms.hasNext()){
- refParameterElement.addChild((OMNode)refParms.next());
+ while (refParms.hasNext()) {
+ refParameterElement.addChild((OMNode) refParms.next());
}
}
return epr;
- }else{
- throw new AxisFault("prefix must ne specified");
+ } else {
+ throw new AxisFault("prefix must be specified");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org