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 da...@apache.org on 2006/12/08 12:31:08 UTC
svn commit: r483945 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
addressing/EndpointReferenceHelper.java engine/Handler.java
Author: davidillsley
Date: Fri Dec 8 03:31:08 2006
New Revision: 483945
URL: http://svn.apache.org/viewvc?view=rev&rev=483945
Log:
Tidy up EndpointReferenceHelper
Add equals method to InvocationResponse class because it overrides hashCode
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?view=diff&rev=483945&r1=483944&r2=483945
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java Fri Dec 8 03:31:08 2006
@@ -71,8 +71,9 @@
map = submissionQNames;
isFinalAddressingNamespace = false;
- if (log.isDebugEnabled())
- log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
+ if (log.isDebugEnabled()){
+ log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
+ }
}
else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
@@ -85,8 +86,9 @@
map = finalQNames;
isFinalAddressingNamespace = true;
- if (log.isDebugEnabled())
- log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
+ if (log.isDebugEnabled()){
+ log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
+ }
}
else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
@@ -119,8 +121,9 @@
map = finalQNames;
isFinalAddressingNamespace = true;
- if (log.isDebugEnabled())
- log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
+ if (log.isDebugEnabled()){
+ log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Final.WSA_NAMESPACE);
+ }
}
else {
address = eprOMElement.getFirstChildWithName((QName) submissionQNames.get(AddressingConstants.EPR_ADDRESS));
@@ -129,8 +132,9 @@
map = submissionQNames;
isFinalAddressingNamespace = false;
- if (log.isDebugEnabled())
- log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
+ if (log.isDebugEnabled()){
+ log.debug("fromOM: Found address element for namespace, " + AddressingConstants.Submission.WSA_NAMESPACE);
+ }
}
else {
throw new AxisFault("Unable to locate an address element for the endpoint reference type.");
@@ -172,10 +176,11 @@
if (qname.getPrefix() != null) {
OMNamespace wrapNs = factory.createOMNamespace(qname.getNamespaceURI(), qname.getPrefix());
- if (factory instanceof SOAPFactory)
+ if (factory instanceof SOAPFactory){
eprElement = ((SOAPFactory) factory).createSOAPHeaderBlock(qname.getLocalPart(), wrapNs);
- else
+ }else{
eprElement = factory.createOMElement(qname.getLocalPart(), wrapNs);
+ }
OMNamespace wsaNS = factory.createOMNamespace(addressingNamespace, AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement addressE = factory.createOMElement(AddressingConstants.EPR_ADDRESS, wsaNS, eprElement);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java?view=diff&rev=483945&r1=483944&r2=483945
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Handler.java Fri Dec 8 03:31:08 2006
@@ -128,6 +128,14 @@
return instructionID;
}
+ public boolean equals(Object obj) {
+ if( !(obj instanceof InvocationResponse) ) {
+ return false;
+ }
+ final InvocationResponse instance = (InvocationResponse)obj;
+ return (instructionID==instance.instructionID);
+ }
+
public String toString() {
return description;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org