Author: djencks
Date: Mon Jun 20 23:32:39 2011
New Revision: 1137824
URL: http://svn.apache.org/viewvc?rev=1137824&view=rev
Log:
OWB-579 More exclusions of synthetic and bridge methods from cdi checks
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=1137824&r1=1137823&r2=1137824&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
Mon Jun 20 23:32:39 2011
@@ -115,7 +115,7 @@ public final class DecoratorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() &&
!Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) &&
ClassUtil.isFinal(modifiers))
{
// Check decorator implements this
Iterator<Decorator<?>> itDecorator =
decoratorList.iterator();
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1137824&r1=1137823&r2=1137824&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
Mon Jun 20 23:32:39 2011
@@ -436,7 +436,7 @@ public final class InterceptorUtil
for (Method method : methods)
{
int modifiers = method.getModifiers();
- if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() &&
!Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) &&
ClassUtil.isFinal(modifiers))
{
if (hasClassInterceptors)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1137824&r1=1137823&r2=1137824&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Mon Jun 20 23:32:39 2011
@@ -3103,7 +3103,7 @@ public final class WebBeansUtil
{
Method method = methodA.getJavaMember();
int modifiers = method.getModifiers();
- if (!Modifier.isStatic(modifiers) &&
!Modifier.isPrivate(modifiers) && ClassUtil.isFinal(modifiers))
+ if (!method.isSynthetic() && !method.isBridge() &&
!Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) &&
ClassUtil.isFinal(modifiers))
{
if (hasClassInterceptors)
{
