Author: kmalhi
Date: Fri Jul 2 14:31:39 2010
New Revision: 960005
URL: http://svn.apache.org/viewvc?rev=960005&view=rev
Log:
fix to make sure that this method works for the scenario where there are
multiple issues in the same bean i.e the bean class has same method but
different args, same method but different case and bean class does not define a
method which was defined in the interface.
This method was working fine when a bean has just one of the above issues
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java?rev=960005&r1=960004&r2=960005&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
Fri Jul 2 14:31:39 2010
@@ -110,9 +110,11 @@ public class CheckMethods extends Valida
if (differentArgs.size() > 0) {
fail(b, "no.busines.method.args",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local",
intrface.getName(), beanClass.getName(), differentArgs.size());
- } else if (differentCase.size() > 0){
+ }
+ if (differentCase.size() > 0){
fail(b, "no.busines.method.case",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local",
intrface.getName(), beanClass.getName(), differentCase.size());
- } else {
+ }
+ if(differentArgs.size() == 0 && differentCase.size() == 0){
fail(b, "no.busines.method",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "local",
intrface.getName(), beanClass.getName());
}
}
@@ -157,9 +159,11 @@ public class CheckMethods extends Valida
if (differentArgs.size() > 0) {
fail(b, "no.busines.method.args",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote",
intrface.getName(), beanClass.getName(), differentArgs.size());
- } else if (differentCase.size() > 0){
+ }
+ if (differentCase.size() > 0){
fail(b, "no.busines.method.case",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote",
intrface.getName(), beanClass.getName(), differentCase.size());
- } else {
+ }
+ if (differentArgs.size() == 0 && differentCase.size() == 0){
fail(b, "no.busines.method",
interfaceMethods[i].getName(), interfaceMethods[i].toString(), "remote",
intrface.getName(), beanClass.getName());
}
}
