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 ke...@apache.org on 2006/12/06 11:02:10 UTC
svn commit: r483008 - in /webservices/axis2/branches/java/WSDL_2_0/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
kernel/src/org/apache/axis2/description/
Author: keithc
Date: Wed Dec 6 02:02:09 2006
New Revision: 483008
URL: http://svn.apache.org/viewvc?view=rev&rev=483008
Log:
fixed null pointer exception
Modified:
webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=483008&r1=483007&r2=483008
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Wed Dec 6 02:02:09 2006
@@ -206,20 +206,21 @@
Object property = null;
// Get the correct AxisBindingOperation coresponding to the AxisOperation
- AxisBindingOperation axisBindingOperation = (AxisBindingOperation) axisBinding.getChild(qName);
+ AxisBindingOperation axisBindingOperation =
+ (AxisBindingOperation) axisBinding.getChild(qName);
AxisBindingMessage axisBindingMessage = null;
if (axisBindingOperation != null) {
axisBindingMessage = (AxisBindingMessage) axisBindingOperation.getChild(key);
- }
+ if (axisBindingMessage != null) {
+ property = axisBindingMessage.getProperty(name);
+ }
- if (axisBindingMessage != null) {
- property = axisBindingMessage.getProperty(name);
+ if (property == null) {
+ property = axisBindingOperation.getProperty(name);
+ }
}
- if (property == null) {
- property = axisBindingOperation.getProperty(name);
- }
if (property == null) {
property = axisBinding.getProperty(name);
@@ -242,15 +243,15 @@
AxisBindingMessage axisBindingFault = null;
if (axisBindingOperation != null) {
axisBindingMessageFault = (AxisBindingMessage) axisBindingOperation.getFault(key);
- }
- if (axisBindingMessageFault != null) {
- property = axisBindingMessageFault.getProperty(name);
- }
+ if (axisBindingMessageFault != null) {
+ property = axisBindingMessageFault.getProperty(name);
+ }
- if (property == null) {
- axisBindingFault = axisBinding.getFault(key);
- property = axisBindingFault.getProperty(name);
+ if (property == null) {
+ axisBindingFault = axisBinding.getFault(key);
+ property = axisBindingFault.getProperty(name);
+ }
}
if (property == null) {
@@ -1784,7 +1785,6 @@
Element methodElement;
List soapHeaderInputParameterList = new ArrayList();
List soapHeaderOutputParameterList = new ArrayList();
- List soapHeaderFaultParameterList = new ArrayList();
methodElement = doc.createElement("method");
String localPart = axisOperation.getName().getLocalPart();
@@ -1813,7 +1813,6 @@
addOutputAndFaultActions(doc, methodElement, axisOperation);
addHeaderOperations(soapHeaderInputParameterList, axisOperation, true);
addHeaderOperations(soapHeaderOutputParameterList, axisOperation, false);
- addHeaderOperationsToFault(soapHeaderFaultParameterList, axisOperation);
/*
* Setting the policy of the operation
@@ -1839,7 +1838,7 @@
axisOperation, soapHeaderOutputParameterList));
}
methodElement.appendChild(getFaultElement(doc,
- axisOperation, soapHeaderFaultParameterList));
+ axisOperation));
return methodElement;
}
@@ -2018,34 +2017,15 @@
}
}
- for (Iterator iterator = headerparamList.iterator(); iterator.hasNext();) {
- SOAPHeaderMessage header = (SOAPHeaderMessage) iterator.next();
- soapHeaderParameterQNameList.add(header.getElement());
- }
- }
-
- /**
- * populate the header parameters to faults
- *
- * @param soapHeaderParameterQNameList
- * @param axisOperation
- */
- protected void addHeaderOperationsToFault(List soapHeaderParameterQNameList, AxisOperation axisOperation) {
- ArrayList headerparamList = new ArrayList();
- ArrayList faultMessages = axisOperation.getFaultMessages();
- Iterator iter = faultMessages.iterator();
- while(iter.hasNext())
- {
- AxisMessage axisFaultMessage = (AxisMessage)iter.next();
- headerparamList.addAll((ArrayList) getBindingPropertyFromMessageFault(WSDL2Constants.ATTR_WSOAP_HEADER, axisOperation.getName(), axisFaultMessage.getName()));
- }
-
+ if (headerparamList != null) {
for (Iterator iterator = headerparamList.iterator(); iterator.hasNext();) {
- SOAPHeaderMessage header = (SOAPHeaderMessage) iterator.next();
- soapHeaderParameterQNameList.add(header.getElement());
+ SOAPHeaderMessage header = (SOAPHeaderMessage) iterator.next();
+ soapHeaderParameterQNameList.add(header.getElement());
+ }
}
}
+
/**
* Get the input element
*
@@ -2102,7 +2082,7 @@
* @param doc
* @param operation
*/
- protected Element getFaultElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+ protected Element getFaultElement(Document doc, AxisOperation operation) {
Element faultElt = doc.createElement("fault");
Element[] param = getFaultParamElements(doc, operation);
@@ -2110,18 +2090,7 @@
faultElt.appendChild(param[i]);
}
- List parameterElementList = getParameterElementList(doc, headerParameterQNameList, WSDLConstants.SOAP_HEADER);
- ArrayList faultMessages = operation.getFaultMessages();
- Iterator iter = faultMessages.iterator();
- while (iter.hasNext()) {
- AxisMessage faultMessage = (AxisMessage)iter.next();
- parameterElementList.addAll(getParameterElementListForHttpHeader(doc,(ArrayList)getBindingPropertyFromMessageFault(WSDL2Constants.ATTR_WHTTP_HEADER,operation.getName(), faultMessage.getName()),WSDLConstants.HTTP_HEADER));
- }
- for (int i = 0; i < parameterElementList.size(); i++) {
- faultElt.appendChild((Element) parameterElementList.get(i));
- }
-
- return faultElt;
+ return faultElt;
}
/**
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java?view=diff&rev=483008&r1=483007&r2=483008
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java Wed Dec 6 02:02:09 2006
@@ -356,7 +356,6 @@
List soapHeaderInputParameterList = new ArrayList();
List soapHeaderOutputParameterList = new ArrayList();
- List soapHeaderFaultParameterList = new ArrayList();
methodElement = doc.createElement("method");
@@ -397,7 +396,7 @@
methodElement.appendChild(getInputElement(doc, axisOperation, soapHeaderInputParameterList));
methodElement.appendChild(getOutputElement(doc, axisOperation, soapHeaderOutputParameterList));
- methodElement.appendChild(getFaultElement(doc, axisOperation, soapHeaderFaultParameterList));
+ methodElement.appendChild(getFaultElement(doc, axisOperation));
rootElement.appendChild(methodElement);
} else {
@@ -452,8 +451,7 @@
methodElement.appendChild(getOutputElement(doc,
axisOperation, soapHeaderOutputParameterList));
methodElement.appendChild(getFaultElement(doc,
- axisOperation, soapHeaderFaultParameterList));
-
+ axisOperation));
rootElement.appendChild(methodElement);
//////////////////////
}
Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=483008&r1=483007&r2=483008
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Wed Dec 6 02:02:09 2006
@@ -226,14 +226,16 @@
}
}
- if (endpoints.length != 0) {
+ if (endpoint == null && endpoints.length > 0) {
endpoint = endpoints[0];
+ }
+
axisService.setEndpointName(endpoint.getName().toString());
axisService.setBindingName(endpoint.getBinding().getName().getLocalPart());
axisService.setEndpointURL(endpoint.getAddress().toString());
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org