You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2009/06/11 14:08:13 UTC

svn commit: r783733 - in /servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http: HttpEndpoint.java endpoints/HttpConsumerEndpoint.java

Author: jbonofre
Date: Thu Jun 11 12:08:13 2009
New Revision: 783733

URL: http://svn.apache.org/viewvc?rev=783733&view=rev
Log:
SMXCOMP-564: Raise a DeploymentException if the endpoint name contains a ':'. If the endpoint name contains a ':', the resulting WSDL is invalid.

Modified:
    servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
    servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java

Modified: servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java?rev=783733&r1=783732&r2=783733&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java Thu Jun 11 12:08:13 2009
@@ -406,6 +406,9 @@
     }
 
     public void validate() throws DeploymentException {
+        if (endpoint != null && endpoint.contains(":")) {
+            throw failure("deploy", "Endpoint name contains ':'. This character is not allowed as it can provide invalid WSDL.", null);
+        }
         if (getRole() == null) {
             throw failure("deploy", "Endpoint must have a defined role", null);
         }

Modified: servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java?rev=783733&r1=783732&r2=783733&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java Thu Jun 11 12:08:13 2009
@@ -520,6 +520,9 @@
 
     public void validate() throws DeploymentException {
         super.validate();
+        if (endpoint != null && endpoint.contains(":")) {
+            throw new DeploymentException("Endpoint name contains ':'. This character is not allowed as it can provide invalid WSDL.");
+        }
         if (marshaler == null) {
             marshaler = new DefaultHttpConsumerMarshaler();
         }