svn commit: r1538456 - in /turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake: IntakeServiceImpl.java model/IntegerField.java model/LongField.java model/ShortField.java

[tv]

Author: tv
Date: Sun Nov  3 21:16:50 2013
New Revision: 1538456

URL: http://svn.apache.org/r1538456
Log:
Fix some FindBugs complaints

Modified:
    
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
    
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
    
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
    
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java

Modified: 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=1538456&r1=1538455&r2=1538456&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
 (original)
+++ 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
 Sun Nov  3 21:16:50 2013
@@ -411,7 +411,7 @@ public class IntakeServiceImpl extends A
             }
             catch (Exception e)
             {
-                new IntakeException("Could not get group " + groupName, e);
+                throw new IntakeException("Could not get group " + groupName, 
e);
             }
         }
     }
@@ -435,7 +435,7 @@ public class IntakeServiceImpl extends A
                             + groupName + " found");
         }
 
-        KeyedObjectPool<String, Group> kop = keyedPools.get(groupName);
+        KeyedObjectPool<String, Group> kop = keyedPools.get(appData);
 
         return kop.getNumActive(groupName) + kop.getNumIdle(groupName);
     }

Modified: 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java?rev=1538456&r1=1538455&r2=1538456&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
 (original)
+++ 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
 Sun Nov  3 21:16:50 2013
@@ -100,7 +100,7 @@ public class IntegerField
         else
         {
             return (null == getEmptyValue())
-                    ? new Integer(0) : getEmptyValue();
+                    ? Integer.valueOf(0) : getEmptyValue();
         }
     }
 

Modified: 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java?rev=1538456&r1=1538455&r2=1538456&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
 (original)
+++ 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
 Sun Nov  3 21:16:50 2013
@@ -100,7 +100,7 @@ public class LongField
         }
         else
         {
-            return (null == getEmptyValue()) ? new Long(0l) : getEmptyValue();
+            return (null == getEmptyValue()) ? Long.valueOf(0l) : 
getEmptyValue();
         }
     }
 

Modified: 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java?rev=1538456&r1=1538455&r2=1538456&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
 (original)
+++ 
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
 Sun Nov  3 21:16:50 2013
@@ -100,7 +100,7 @@ public class ShortField
         else
         {
             return (null == getEmptyValue())
-                    ? new Short((short) 0) : getEmptyValue();
+                    ? Short.valueOf((short) 0) : getEmptyValue();
         }
     }
 
@@ -143,7 +143,7 @@ public class ShortField
             }
             else
             {
-                setTestValue(new Short(value.shortValue()));
+                setTestValue(Short.valueOf(value.shortValue()));
             }
         }
     }