Author: dkulp
Date: Tue Oct 6 21:19:31 2009
New Revision: 822508
URL: http://svn.apache.org/viewvc?rev=822508&view=rev
Log:
Merged revisions 822500 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r822500 | dkulp | 2009-10-06 17:11:52 -0400 (Tue, 06 Oct 2009) | 2 lines
[CXF-2308] add a setTo(org.apache.cxf.ws.addressing.AttributedURIType)
method
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/AddressingPropertiesImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java?rev=822508&r1=822507&r2=822508&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
(original)
+++
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
Tue Oct 6 21:19:31 2009
@@ -41,6 +41,12 @@
* @param epr new value for To property
*/
void setTo(EndpointReferenceType epr);
+
+ /**
+ * Mutator for the <b>To</b> property.
+ * @param epr new value for To property
+ */
+ void setTo(AttributedURIType epr);
/**
* Accessor for the <b>From</b> property.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/AddressingPropertiesImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/AddressingPropertiesImpl.java?rev=822508&r1=822507&r2=822508&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/AddressingPropertiesImpl.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/AddressingPropertiesImpl.java
Tue Oct 6 21:19:31 2009
@@ -30,6 +30,7 @@
*/
public class AddressingPropertiesImpl implements AddressingProperties {
private EndpointReferenceType to;
+ private AttributedURIType toURIType;
private EndpointReferenceType from;
private AttributedURIType messageID;
private EndpointReferenceType replyTo;
@@ -65,17 +66,27 @@
* @return To property
*/
public AttributedURIType getTo() {
- return null != to ? to.getAddress() : null;
+ if (toURIType == null) {
+ return null != to ? to.getAddress() : null;
+ }
+ return toURIType;
}
/**
* Mutator for the <b>To</b> property.
* @param iri new value for To property
*/
+ public void setTo(AttributedURIType t) {
+ toURIType = t;
+ }
+ /**
+ * Mutator for the <b>To</b> property.
+ * @param iri new value for To property
+ */
public void setTo(EndpointReferenceType epr) {
to = epr;
+ toURIType = null;
}
-
/**
* Accessor for the <b>From</b> property.
* @return current value of From property
