You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/03/22 20:43:28 UTC
svn commit: r1084319 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
intercept/InterceptorDataImpl.java intercept/InterceptorUtil.java
util/ClassUtil.java
Author: struberg
Date: Tue Mar 22 19:43:27 2011
New Revision: 1084319
URL: http://svn.apache.org/viewvc?rev=1084319&view=rev
Log:
OWB-461 code cleanup
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.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/ClassUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=1084319&r1=1084318&r2=1084319&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Tue Mar 22 19:43:27 2011
@@ -412,7 +412,7 @@ public class InterceptorDataImpl impleme
// check for this InterceptorData is defined by interceptor class
if (this.isDefinedWithWebBeansInterceptor && this.definedInInterceptorClass)
{
- Object interceptor = null;
+ Object interceptor;
// Means that it is the last interceptor added by InterceptorHandler
if (this.webBeansInterceptor == null)
@@ -437,7 +437,7 @@ public class InterceptorDataImpl impleme
return interceptor;
}
- EjbInterceptorContext ctx = null;
+ EjbInterceptorContext ctx ;
Object interceptor = null;
// control for this InterceptorData is defined by interceptor class
if (this.definedInInterceptorClass)
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=1084319&r1=1084318&r2=1084319&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 Tue Mar 22 19:43:27 2011
@@ -94,8 +94,6 @@ public final class InterceptorUtil
*/
public boolean isWebBeansBusinessMethod(Method method)
{
- Asserts.nullCheckForMethod(method);
-
int modifiers = method.getModifiers();
if ((modifiers & MODIFIER_STATIC_FINAL_PRIVATE) != 0)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1084319&r1=1084318&r2=1084319&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Tue Mar 22 19:43:27 2011
@@ -390,7 +390,7 @@ public final class ClassUtil
{
if (objectMethodNames == null)
{
- // not much syncronisation needed...
+ // not much synchronisation needed...
Set<String> list = new HashSet<String>();
Class<?> clazz = Object.class;
@@ -410,7 +410,6 @@ public final class ClassUtil
public static boolean isObjectMethod(String methodName)
{
- Asserts.assertNotNull(methodName, "methodName parameter can not be null");
return getObjectMethodNames().contains(methodName);
}