axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From barre...@apache.org
Subject svn commit: r528066 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Date Thu, 12 Apr 2007 18:00:31 GMT
Author: barrettj
Date: Thu Apr 12 11:00:29 2007
New Revision: 528066

URL: http://svn.apache.org/viewvc?view=rev&rev=528066
Log:
AXIS2-2517
Fix the validation of checked exceptions between an SEI and a service implementation

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?view=diff&rev=528066&r1=528065&r2=528066
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Thu Apr 12 11:00:29 2007
@@ -993,40 +993,40 @@
         String[] seiExceptions = seiMDC.getExceptions();
         String[] implExceptions = implMDC.getExceptions();
 
+        // An impl can choose to throw fewer checked exceptions than declared on the SEI,
but not more.
+        // This is analagous to the Java rules for interfaces.
         if (seiExceptions == null) {
             if (implExceptions == null) {
                 return;
             } else {
-                //Exception: sei list is null, but impl list is not null
-                throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature does not match SEI method signature - mismatched exceptions list: Implementation
class: "
-                        + composite.getClassName() 
-                        + "; method name: " + seiMDC.getMethodName() 
-                        + "; endpointInterface: " + className);
-
-            }
-        } else if (implExceptions == null) {
-            //Exception: sei list is not null, but impl list is null
-            throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature does not match SEI method signature - mismatched exceptions list: Implementation
class: "
+                // SEI delcares no checked exceptions, but the implementation has checked
exceptions, which is an error
+                throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature has more checked exceptions than SEI method signature (0): Implementation
class: "
                     + composite.getClassName() 
                     + "; method name: " + seiMDC.getMethodName() 
                     + "; endpointInterface: " + className);
-
+            }
+        } else if (implExceptions == null) {
+            // Implementation throws fewer checked exceptions than SEI, which is OK.
+            return;
         }
         
-        //check the list length
-        if (seiExceptions.length != implExceptions.length) {
-            throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature does not match SEI method signature - mismatched exceptions list: Implementation
class: "
-                                            + composite.getClassName() 
-                                            + "; method name: " + seiMDC.getMethodName()

-                                            + "; endpointInterface: " + className);
+        // Check the list length; An implementation can not declare more exceptions than
the SEI
+        if (seiExceptions.length < implExceptions.length) {
+            throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature has more checked exceptions ("
+                + implExceptions.length + ") than SEI method signature ("
+                + seiExceptions.length + "): Implementation class: "
+                + composite.getClassName() 
+                + "; method name: " + seiMDC.getMethodName() 
+                + "; endpointInterface: " + className);
         }
         
-        if (seiExceptions.length > 0) {     
-            
-            for (String seiException : seiExceptions) {
+        // Make sure that each checked exception declared by the 
+        // implementation is on the SEI also
+        if (implExceptions.length > 0) {                
+            for (String implException : implExceptions) {
                 boolean foundIt = false;
-                if (implExceptions.length > 0) {        
-                    for (String implException : implExceptions) {
+                if (seiExceptions.length > 0) {         
+                    for (String seiException : seiExceptions) {
                         if (seiException.equals(implException)) {
                             foundIt = true;
                             break;
@@ -1035,11 +1035,11 @@
                 }
                 
                 if (!foundIt) {
-                    throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature does not match SEI method signature - mismatched exceptions list: Implementation
class: "
-                                                                    + composite.getClassName()

-                                                                    + "; method name: " +
seiMDC.getMethodName() 
-                                                                    + "; endpointInterface:
" + className);
-
+                    throw ExceptionFactory.makeWebServiceException("Validation error: Implementation
method signature throws exception " 
+                        + implException + "which is not declared on the SEI method signature:
Implementation class: "
+                        + composite.getClassName() 
+                        + "; method name: " + seiMDC.getMethodName() 
+                        + "; endpointInterface: " + className);
                 }
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message