Author: indika
Date: Tue Oct 23 04:45:26 2007
New Revision: 587462
URL: http://svn.apache.org/viewvc?rev=587462&view=rev
Log:
fixed the NPE when creating WSDL EP from wrong uri
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_200.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=587462&r1=587461&r2=587462&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
Tue Oct 23 04:45:26 2007
@@ -28,6 +28,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMNamespace;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axis2.description.WSDL2Constants;
@@ -124,23 +125,27 @@
wsdlEndpoint.setPortName(portName);
if (wsdlURI != null) {
- wsdlEndpoint.setWsdlURI(wsdlURI.trim());
+ wsdlEndpoint.setWsdlURI(wsdlURI.trim());
try {
- String ns = SynapseConfigUtils.getOMElementFromURL(new
URL(wsdlURI).toString())
- .getNamespace().getNamespaceURI();
-
- if
(org.apache.axis2.namespace.Constants.NS_URI_WSDL11.equals(ns)) {
- endpoint = new WSDL11EndpointBuilder().
- createEndpointDefinitionFromWSDL(wsdlURI,
serviceName, portName);
-
- } else if (WSDL2Constants.WSDL_NAMESPACE.equals(ns)) {
- //endpoint = new WSDL20EndpointBuilder().
- // createEndpointDefinitionFromWSDL(wsdlURI,
serviceName, portName);
-
- handleException("WSDL 2.0 Endpoints are currently not
supported");
+ OMElement wsdlOM = SynapseConfigUtils.getOMElementFromURL(
+ new URL(wsdlURI).toString());
+ if (wsdlOM != null) {
+ OMNamespace ns = wsdlOM.getNamespace();
+ if (ns != null) {
+ String nsUri =
wsdlOM.getNamespace().getNamespaceURI();
+ if
(org.apache.axis2.namespace.Constants.NS_URI_WSDL11.equals(nsUri)) {
+ endpoint = new WSDL11EndpointBuilder().
+ createEndpointDefinitionFromWSDL(wsdlOM,
serviceName, portName);
+
+ } else if
(WSDL2Constants.WSDL_NAMESPACE.equals(nsUri)) {
+ //endpoint = new WSDL20EndpointBuilder().
+ //
createEndpointDefinitionFromWSDL(wsdlURI, serviceName, portName);
+
+ handleException("WSDL 2.0 Endpoints are
currently not supported");
+ }
+ }
}
-
} catch (Exception e) {
handleException("Couldn't create endpoint from the given
WSDL URI : "
+ e.getMessage(), e);
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_200.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_200.xml?rev=587462&r1=587461&r2=587462&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_200.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_200.xml
Tue Oct 23 04:45:26 2007
@@ -37,7 +37,7 @@
<property name="text"
value="** Looking up from the Database **"/>
</log>
- <dblookup xmlns="http://ws.apache.org/ns/synapse";>
+ <dblookup>
<connection>
<pool>
<driver>org.apache.derby.jdbc.ClientDriver</driver>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml?rev=587462&r1=587461&r2=587462&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_201.xml
Tue Oct 23 04:45:26 2007
@@ -33,7 +33,7 @@
<property name="text"
value="** Reporting to the Database **"/>
</log>
- <dbreport xmlns="http://ws.apache.org/ns/synapse";>
+ <dbreport>
<connection>
<pool>
<driver>org.apache.derby.jdbc.ClientDriver</driver>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml?rev=587462&r1=587461&r2=587462&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_202.xml
Tue Oct 23 04:45:26 2007
@@ -34,7 +34,7 @@
value="** Reporting to the Database **"/>
</log>
- <dbreport xmlns="http://ws.apache.org/ns/synapse";>
+ <dbreport>
<connection>
<pool>
<driver>org.apache.derby.jdbc.ClientDriver</driver>
@@ -55,7 +55,7 @@
<property name="text"
value="** Looking up from the Database **"/>
</log>
- <dblookup xmlns="http://ws.apache.org/ns/synapse";>
+ <dblookup>
<connection>
<pool>
<driver>org.apache.derby.jdbc.ClientDriver</driver>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
