[hornetq-commits] JBoss hornetq SVN: r12167 - in trunk: hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2012-02-23 04:37:21 -0500 (Thu, 23 Feb 2012)
New Revision: 12167

Modified:
   trunk/etc/findbugs-exclude.xml
   trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/Util.java
Log:
Filter warnings from Util comparisons. Make Util 'final'.

Modified: trunk/etc/findbugs-exclude.xml
===================================================================
--- trunk/etc/findbugs-exclude.xml	2012-02-23 04:40:27 UTC (rev 12166)
+++ trunk/etc/findbugs-exclude.xml	2012-02-23 09:37:21 UTC (rev 12167)
@@ -15,6 +15,18 @@
   </Match>
 
   <Match>
+    <Class name="org.hornetq.ra.Util"/>
+    <Or>
+      <Method name="compare" params="java.lang.Integer,java.lang.Integer" returns="boolean"/>
+      <Method name="compare" params="java.lang.Long,java.lang.Long" returns="boolean"/>
+      <Method name="compare" params="java.lang.String,java.lang.String" returns="boolean"/>
+      <Method name="compare" params="java.lang.Boolean,java.lang.Boolean" returns="boolean"/>
+      <Method name="compare" params="java.lang.Double,java.lang.Double" returns="boolean"/>
+    </Or>
+    <Bug pattern="RC_REF_COMPARISON"/>
+  </Match>
+
+  <Match>
     <!-- As per Java Messaging Specification 3.5.4:
 
          "

Modified: trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/Util.java
===================================================================
--- trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/Util.java	2012-02-23 04:40:27 UTC (rev 12166)
+++ trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/Util.java	2012-02-23 09:37:21 UTC (rev 12167)
@@ -13,7 +13,11 @@
 package org.hornetq.ra;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
 
 import javax.naming.Context;
 import javax.transaction.TransactionManager;
@@ -28,9 +32,9 @@
  * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
  * @version $Revision: $
  */
-public class Util
+public final class Util
 {
-   
+
    private static final Logger log = Logger.getLogger(Util.class);
 
 
@@ -45,7 +49,7 @@
     * Compare two strings.
     * @param me First value
     * @param you Second value
-    * @return True if object equals else false. 
+    * @return True if object equals else false.
     */
    public static boolean compare(final String me, final String you)
    {
@@ -69,7 +73,7 @@
     * Compare two integers.
     * @param me First value
     * @param you Second value
-    * @return True if object equals else false. 
+    * @return True if object equals else false.
     */
    public static boolean compare(final Integer me, final Integer you)
    {
@@ -93,7 +97,7 @@
     * Compare two longs.
     * @param me First value
     * @param you Second value
-    * @return True if object equals else false. 
+    * @return True if object equals else false.
     */
    public static boolean compare(final Long me, final Long you)
    {
@@ -117,7 +121,7 @@
     * Compare two doubles.
     * @param me First value
     * @param you Second value
-    * @return True if object equals else false. 
+    * @return True if object equals else false.
     */
    public static boolean compare(final Double me, final Double you)
    {
@@ -141,7 +145,7 @@
     * Compare two booleans.
     * @param me First value
     * @param you Second value
-    * @return True if object equals else false. 
+    * @return True if object equals else false.
     */
    public static boolean compare(final Boolean me, final Boolean you)
    {
@@ -174,10 +178,10 @@
       return context.lookup(name);
    }
 
-   /** 
+   /**
     * Used on parsing JNDI Configuration
     * @param config
-    * @return
+    * @return hash-table with configuration option pairs
     */
    public static Hashtable<?,?> parseHashtableConfig(final String config)
    {
@@ -243,13 +247,13 @@
 
       return res;
    }
-   
 
+
    /** The Resource adapter can't depend on any provider's specific library. Because of that we use reflection to locate the
-    *  transaction manager during startup. 
-    *  
-    *  
-    *  TODO: https://jira.jboss.org/browse/HORNETQ-417 
+    *  transaction manager during startup.
+    *
+    *
+    *  TODO: https://jira.jboss.org/browse/HORNETQ-417
     *        We should use a proper SPI instead of reflection
     *        We would need to define a proper SPI package for this.
     *  */