Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 33083 invoked from network); 22 Mar 2011 19:43:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Mar 2011 19:43:52 -0000 Received: (qmail 22800 invoked by uid 500); 22 Mar 2011 19:43:52 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 22769 invoked by uid 500); 22 Mar 2011 19:43:52 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 22757 invoked by uid 99); 22 Mar 2011 19:43:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2011 19:43:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2011 19:43:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43B1F23888EA; Tue, 22 Mar 2011 19:43:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1084319 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: intercept/InterceptorDataImpl.java intercept/InterceptorUtil.java util/ClassUtil.java Date: Tue, 22 Mar 2011 19:43:28 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110322194328.43B1F23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 list = new HashSet(); 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); }