[jbossws-commits] JBossWS SVN: r1613 - trunk/src/main/java/org/jboss/ws/metadata/umdm

[jbossws-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2006-12-08 00:56:53 -0500 (Fri, 08 Dec 2006)
New Revision: 1613

Modified:
   trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
Log:
Fix parameter matching on wrapped OUT parameters

Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java	2006-12-07 19:12:56 UTC (rev 1612)
+++ trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java	2006-12-08 05:56:53 UTC (rev 1613)
@@ -231,21 +231,16 @@
 
       for (ParameterMetaData param : getParameters())
       {
-         if (param.matchParameter(method, matches, exact) == false)
+         if (!param.matchParameter(method, matches, exact))
             return false;
       }
 
-      // We should have an entry for every parameter index if we match
-      if (matches.size() != paramTypes.length)
-         return false;
-
       ParameterMetaData returnMetaData = getReturnParameter();
-      if (returnMetaData != null)
-      {
-         return returnMetaData.matchParameter(method, matches, exact);
-      }
+      if (returnMetaData != null && !returnMetaData.matchParameter(method, matches, exact))
+return false;
 
-      return true;
+      // We should have an entry for every parameter index if we match
+      return matches.size() == paramTypes.length;
    }
    
    /** Return true if this is a generic message style destination that takes a org.w3c.dom.Element