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 de...@apache.org on 2006/02/16 13:59:57 UTC
svn commit: r378239 - in /webservices/axis2/trunk/java/modules:
addressing/src/META-INF/module.xml core/conf/axis2.xml
core/src/org/apache/axis2/client/ServiceClient.java
core/src/org/apache/axis2/engine/DispatchPhase.java
Author: deepal
Date: Thu Feb 16 04:59:54 2006
New Revision: 378239
URL: http://svn.apache.org/viewcvs?rev=378239&view=rev
Log:
-fix Addressing description
Modified:
webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
webservices/axis2/trunk/java/modules/core/conf/axis2.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml?rev=378239&r1=378238&r2=378239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/META-INF/module.xml Thu Feb 16 04:59:54 2006
@@ -1,7 +1,5 @@
<module name="addressing">
- <Description>This is WS-Addressing implementation on Axis2. Currently we have implemented Submission
- version (2004/08) and Candidate Recommendation (2005/08). This is not complete as far as the fault handling
- is concerned. But we are working on that. </Description>
+ <Description>This is WS-Addressing implementation on Axis2. Currently we have implemented Submission version (2004/08) and Candidate Recommendation (2005/08). This is not complete as far as the fault handling is concerned. But we are working on that. </Description>
<inflow>
<handler name="AddressingFinalInHandler" class="org.apache.axis2.handlers.addressing.AddressingFinalInHandler">
<order phase="PreDispatch"/>
Modified: webservices/axis2/trunk/java/modules/core/conf/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/conf/axis2.xml?rev=378239&r1=378238&r2=378239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/core/conf/axis2.xml Thu Feb 16 04:59:54 2006
@@ -81,8 +81,7 @@
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding" locked="false">chunked</parameter>
</transportSender>
- <transportSender name="https"
- class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <transportSender name="https" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding" locked="false">chunked</parameter>
</transportSender>
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=378239&r1=378238&r2=378239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Thu Feb 16 04:59:54 2006
@@ -124,9 +124,8 @@
if (this.axisConfig.getService(this.axisService.getName()) == null) {
this.axisConfig.addService(this.axisService);
}
- ServiceGroupContext sgc = new ServiceGroupContext(
- this.configContext, (AxisServiceGroup) this.axisService
- .getParent());
+ ServiceGroupContext sgc = new ServiceGroupContext(this.configContext,
+ (AxisServiceGroup) this.axisService.getParent());
this.serviceContext = sgc.getServiceContext(this.axisService);
} catch (IOException e) {
throw new AxisFault(e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java?rev=378239&r1=378238&r2=378239&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchPhase.java Thu Feb 16 04:59:54 2006
@@ -87,7 +87,7 @@
String incommingTrs = msgctx.getIncomingTransportName();
for (int i = 0; i < trs.length; i++) {
String tr = trs[i];
- if (incommingTrs.equals(tr)) {
+ if (incommingTrs != null && incommingTrs.equals(tr)) {
return;
}
}