[jboss-cvs] JBossAS SVN: r94415 - in projects/aop/trunk/aop/src/main: java/org/jboss/aop/advice/annotation/assignability and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-10-06 11:05:13 -0400 (Tue, 06 Oct 2009)
New Revision: 94415

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceFactory.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ScopedInterceptorFactory.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointClassification.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerCacheUtil.java
   projects/aop/trunk/aop/src/main/resources/findbugs/exclude.xml
Log:
[JBAOP-757] More bug fixes and findbugs excludes

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceFactory.java	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceFactory.java	2009-10-06 15:05:13 UTC (rev 94415)
@@ -212,6 +212,7 @@
          result = 31 * result + advice.hashCode();
          result = 31 * result + aspect.hashCode();
          result = 31 * result + type.hashCode();
+         cachedHash = result;
       }
       return result;
    }

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ScopedInterceptorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ScopedInterceptorFactory.java	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ScopedInterceptorFactory.java	2009-10-06 15:05:13 UTC (rev 94415)
@@ -150,6 +150,7 @@
       {
          result = 17;
          result = 31 * result + aspect.hashCode();
+         cachedHash = result;
       }
       return result;
    }

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/annotation/assignability/ArgumentContextualizer.java	2009-10-06 15:05:13 UTC (rev 94415)
@@ -433,6 +433,7 @@
             result = 31 * result + ownerType.hashCode();
             result = 31 * result + rawType.hashCode();
             result = 31 * result + Arrays.hashCode(arguments);
+            cachedHash = result;
          }
          return result;
       }

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointClassification.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointClassification.java	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointClassification.java	2009-10-06 15:05:13 UTC (rev 94415)
@@ -112,6 +112,7 @@
       {
          result = 17;
          result = 31 * result + description.hashCode();
+         cachedHash = result;
       }
       return result;
    }

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerCacheUtil.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerCacheUtil.java	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerCacheUtil.java	2009-10-06 15:05:13 UTC (rev 94415)
@@ -21,7 +21,6 @@
 */ 
 package org.jboss.aop.proxy.container;
 
-import java.io.Serializable;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -81,7 +80,7 @@
          return false;
       }
       
-      if (my != null && my != null)
+      if (my != null && other != null)
       {
          if (my.length != other.length)
          {

Modified: projects/aop/trunk/aop/src/main/resources/findbugs/exclude.xml
===================================================================
--- projects/aop/trunk/aop/src/main/resources/findbugs/exclude.xml	2009-10-06 14:41:25 UTC (rev 94414)
+++ projects/aop/trunk/aop/src/main/resources/findbugs/exclude.xml	2009-10-06 15:05:13 UTC (rev 94415)
@@ -395,6 +395,23 @@
       <Method name="outputAdvisor" params="int, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, org.jboss.aop.ClassAdvisor, java.lang.String" returns="void"/>
       <Bug pattern="NP_NULL_ON_SOME_PATH"/>
    </Match>
+
+   <!-- These are not actually repeated -->            
+   <Match>
+      <Class name="org.jboss.aop.AspectXmlLoader"/>
+      <Method name="deployPrepare" params="org.w3c.dom.Element" returns="void"/>
+      <Bug pattern="RpC_REPEATED_CONDITIONAL_TEST"/>
+   </Match>
+   <Match>
+      <Class name="org.jboss.aop.AspectXmlLoader"/>
+      <Method name="loadAnnotationIntroduction" params="org.w3c.dom.Element" returns="org.jboss.aop.introduction.AnnotationIntroduction"/>
+      <Bug pattern="RpC_REPEATED_CONDITIONAL_TEST"/>
+   </Match>
+   <Match>
+      <Class name="org.jboss.aop.AspectXmlLoader"/>
+      <Method name="loadAnnotationIntroduction" params="org.w3c.dom.Element" returns="org.jboss.aop.introduction.AnnotationIntroduction"/>
+      <Bug pattern="RpC_REPEATED_CONDITIONAL_TEST"/>
+   </Match>
             
                
 </FindBugsFilter>