You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/03/17 03:06:35 UTC
svn commit: r519214 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
Author: dblevins
Date: Fri Mar 16 19:06:34 2007
New Revision: 519214
URL: http://svn.apache.org/viewvc?view=rev&rev=519214
Log:
Fixed exclude issue
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?view=diff&rev=519214&r1=519213&r2=519214
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Fri Mar 16 19:06:34 2007
@@ -280,7 +280,7 @@
try {
Class param = Classes.forName(methodParam, parameterType.getClassLoader());
- if (param.equals(parameterType)) {
+ if (!param.equals(parameterType)) {
return false;
}
} catch (ClassNotFoundException e) {
@@ -288,7 +288,7 @@
}
}
- return false;
+ return true;
}
private static String getName(Class<?> type) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java?view=diff&rev=519214&r1=519213&r2=519214
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java Fri Mar 16 19:06:34 2007
@@ -92,15 +92,26 @@
int i = target.echo(123);
assertEquals(123, i);
-// assertCalls(
-// Call.Default_Invoke_BEFORE,
-// Call.Method_Invoke_BEFORE,
-// Call.Bean_Invoke_BEFORE,
-// Call.Bean_Invoke,
-// Call.Bean_Invoke_AFTER,
-// Call.Method_Invoke_AFTER,
-// Call.Default_Invoke_AFTER);
-// calls.clear();
+ assertCalls(
+ Call.Default_Invoke_BEFORE,
+ Call.Method_Invoke_BEFORE,
+ Call.Bean_Invoke_BEFORE,
+ Call.Bean_Invoke,
+ Call.Bean_Invoke_AFTER,
+ Call.Method_Invoke_AFTER,
+ Call.Default_Invoke_AFTER);
+ calls.clear();
+
+ boolean b = target.echo(true);
+ assertEquals(true, b);
+
+ assertCalls(
+ Call.Method_Invoke_BEFORE,
+ Call.Bean_Invoke_BEFORE,
+ Call.Bean_Invoke,
+ Call.Bean_Invoke_AFTER,
+ Call.Method_Invoke_AFTER);
+ calls.clear();
try {
target.throwAppException();
@@ -202,12 +213,14 @@
@ExcludeClassInterceptors
public int echo(int i) {
+ calls.add(Call.Bean_Invoke);
return i;
}
@ExcludeClassInterceptors
@ExcludeDefaultInterceptors
public boolean echo(boolean i) {
+ calls.add(Call.Bean_Invoke);
return i;
}
}
@@ -217,6 +230,7 @@
void throwAppException() throws AppException;
void throwSysException();
int echo(int i);
+ boolean echo(boolean b);
}
public static class AppException extends Exception {