Author: veithen
Date: Sun Dec 19 12:50:36 2010
New Revision: 1050836
URL: http://svn.apache.org/viewvc?rev=1050836&view=rev
Log:
AXIS2-4674, AXIS2-4871: Applied patch provided by Pradeep Fernando.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1050836&r1=1050835&r2=1050836&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
Sun Dec 19 12:50:36 2010
@@ -1307,7 +1307,7 @@ public class AxisService extends AxisDes
ArrayList<XmlSchema> schemas = getSchema();
// a name is present - try to pump the requested schema
- if (!"".equals(xsd)) {
+ if ((xsd != null) && (!"".equals(xsd))) {
XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
if (schema == null) {
int dotIndex = xsd.indexOf('.');
@@ -1735,8 +1735,9 @@ public class AxisService extends AxisDes
*/
public int printWSDL2(OutputStream out, String requestIP, String wsdl)
throws IOException, AxisFault {
- // a name is present - try to pump the requested wsdl file
- if (!"".equals(wsdl)) {
+ // if the wsdl2 parameter is not empty or null in the requested URL,
get the wsdl from the META-INF and serve.
+ //else construct the wsdl out of axis service and serve.
+ if ((wsdl != null ) && (!"".equals(wsdl))) {
// make sure we are only serving .wsdl files and ignore requests
with
// ".." in the name.
if (wsdl.endsWith(".wsdl") && wsdl.indexOf("..") == -1) {
