[jboss-cvs] JBossAS SVN: r95862 - in projects/kernel/trunk/dependency/src/main: resources/findbugs and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-10-30 14:20:02 -0400 (Fri, 30 Oct 2009)
New Revision: 95862

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
   projects/kernel/trunk/dependency/src/main/resources/findbugs/exclude.xml
Log:
Findbugs fixes and filters

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-10-30 18:19:49 UTC (rev 95861)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-10-30 18:20:02 UTC (rev 95862)
@@ -959,13 +959,12 @@
       }
       else
       {
-         //currentIndex = states.indexOf(fromState);
          fromContexts = fromController.getContextsByState(fromState);
          if (fromContexts.contains(context) == false)
             throw new IllegalStateException("Context not found in previous state (" + fromState + "): " + context.toShortString());
          toState = stateModel.getNextState(fromState);
          if (toState == null)
-            throw new IllegalStateException("No state after " + toState);
+            throw new IllegalStateException("No state after " + fromState);
       }
 
       unlockWrite();

Modified: projects/kernel/trunk/dependency/src/main/resources/findbugs/exclude.xml
===================================================================
--- projects/kernel/trunk/dependency/src/main/resources/findbugs/exclude.xml	2009-10-30 18:19:49 UTC (rev 95861)
+++ projects/kernel/trunk/dependency/src/main/resources/findbugs/exclude.xml	2009-10-30 18:20:02 UTC (rev 95862)
@@ -35,4 +35,13 @@
       <Class name="org.jboss.dependency.plugins.BasicStatistic"/>
       <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
    </Match>
+   
+   <!-- This is about fromContexts which is set in an else block, but not in the if block -->
+   <Match>
+      <Class name="org.jboss.dependency.plugins.AbstractController"/>
+      <Method name="incrementState" params="org.jboss.dependency.spi.ControllerContext, boolean" returns="boolean"/>
+      <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
+   </Match>
+            
+   
 </FindBugsFilter>
\ No newline at end of file