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 2007/06/27 14:34:41 UTC
svn commit: r551142 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/description/AxisService.java
metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
Author: deepal
Date: Wed Jun 27 05:34:40 2007
New Revision: 551142
URL: http://svn.apache.org/viewvc?view=rev&rev=551142
Log:
fixing build break
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=551142&r1=551141&r2=551142
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Wed Jun 27 05:34:40 2007
@@ -742,7 +742,7 @@
} else {
operationsAliasesMap.put(action, axisOperation);
//Adding operation name to the mapping table
- operationsAliasesMap.put(axisOperation.getName().getLocalPart(), axisOperation);
+// operationsAliasesMap.put(axisOperation.getName().getLocalPart(), axisOperation);
}
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?view=diff&rev=551142&r1=551141&r2=551142
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java Wed Jun 27 05:34:40 2007
@@ -433,21 +433,27 @@
void addToAxisService(AxisService axisService) {
AxisOperation newAxisOperation = getAxisOperation();
QName axisOpQName = newAxisOperation.getName();
- if (axisService.getOperation(axisOpQName) == null) {
+ AxisOperation axisOperation = axisService.getOperation(axisOpQName);
+ if (axisOperation == null) {
axisService.addOperation(newAxisOperation);
// For a Doc/Lit/Bare operation, we also need to add the element mapping
- if (getSoapBindingStyle() == javax.jws.soap.SOAPBinding.Style.DOCUMENT
- && getSoapBindingUse() == javax.jws.soap.SOAPBinding.Use.LITERAL
- && getSoapBindingParameterStyle() == javax.jws.soap.SOAPBinding.ParameterStyle
- .BARE) {
- AxisMessage axisMessage =
- newAxisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- if (axisMessage != null) {
- QName elementQName = axisMessage.getElementQName();
- if (!DescriptionUtils.isEmpty(elementQName)) {
- axisService.addMessageElementQNameToOperationMapping(elementQName,
- newAxisOperation);
- }
+ }
+ if (getSoapBindingStyle() == javax.jws.soap.SOAPBinding.Style.DOCUMENT
+ && getSoapBindingUse() == javax.jws.soap.SOAPBinding.Use.LITERAL
+ && getSoapBindingParameterStyle() == javax.jws.soap.SOAPBinding.ParameterStyle
+ .BARE) {
+ AxisMessage axisMessage =
+ null;
+ if (axisOperation!=null) {
+ axisMessage = axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ } else {
+ axisMessage = newAxisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ }
+ if (axisMessage != null) {
+ QName elementQName = axisMessage.getElementQName();
+ if (!DescriptionUtils.isEmpty(elementQName)) {
+ axisService.addMessageElementQNameToOperationMapping(elementQName,
+ newAxisOperation);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org