You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2006/01/23 23:25:55 UTC

svn commit: r371689 - /xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java

Author: cezar
Date: Mon Jan 23 14:25:53 2006
New Revision: 371689

URL: http://svn.apache.org/viewcvs?rev=371689&view=rev
Log:
Allow polymorphism in Extension Interfaces Feature. Partly contributed by Edward Frederick.

checkintests pass


Modified:
    xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java

Modified: xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java?rev=371689&r1=371688&r2=371689&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java (original)
+++ xmlbeans/trunk/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java Mon Jan 23 14:25:53 2006
@@ -146,8 +146,11 @@
                 {
 
                     InterfaceExtensionImpl.MethodSignatureImpl ms2 = (InterfaceExtensionImpl.MethodSignatureImpl) methodSignatures.get(methods[j]);
-                    BindingConfigImpl.error("Colliding methods '" + ms.getSignature() + "' in interfaces " +
+                    if (!ms.getReturnType().equals(ms2.getReturnType()))
+                    {
+                        BindingConfigImpl.error("Colliding methods '" + ms.getSignature() + "' in interfaces " +
                         ms.getInterfaceName() + " and " + ms2.getInterfaceName() + ".", null);
+                    }
 
                     return;
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org