Author: painter
Date: Mon Oct 8 15:57:04 2018
New Revision: 1843165
URL: http://svn.apache.org/viewvc?rev=1843165&view=rev
Log:
Wrapping up a few more findbug complaints
Modified:
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
turbine/fulcrum/trunk/yaafi/contrib/TurbineYaafiComponentService.java
turbine/fulcrum/trunk/yaafi/contrib/java/org/apache/fulcrum/yaafi/framework/configuration/CommonsConfigurationCCPResolver.java
Modified:
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
(original)
+++
turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
Mon Oct 8 15:57:04 2018
@@ -118,10 +118,19 @@ public class DefaultConfigurationService
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
- @Override
+ @Override
public boolean equals(Object obj)
{
- return configuration.equals(obj);
+ if (obj == configuration) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (configuration.getClass() == obj.getClass()) {
+ return configuration.equals(((CompositeConfiguration)obj));
+ }
+ return false;
}
/**
Modified:
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
(original)
+++
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
Mon Oct 8 15:57:04 2018
@@ -280,7 +280,7 @@ public class UnixCrypt
{
Random randomGenerator = new Random();
int numSaltChars = saltChars.length;
- String salt = "" + saltChars[Math.abs(randomGenerator.nextInt()) %
numSaltChars] + saltChars[Math.abs(randomGenerator.nextInt()) % numSaltChars];
+ String salt = "" + saltChars[Math.abs(randomGenerator.nextInt() %
numSaltChars)] + saltChars[Math.abs(randomGenerator.nextInt() % numSaltChars)];
return crypt(salt, original);
}
Modified:
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
(original)
+++
turbine/fulcrum/trunk/crypto/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
Mon Oct 8 15:57:04 2018
@@ -96,10 +96,10 @@ public class UnixCrypt
int numSaltChars = SALT_CHARS.length;
seed = (new StringBuilder())
- .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
- % numSaltChars])
- .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
- % numSaltChars])
+ .append(SALT_CHARS[Math.abs(randomGenerator.nextInt()
+ % numSaltChars)])
+ .append(SALT_CHARS[Math.abs(randomGenerator.nextInt()
+ % numSaltChars)])
.toString();
}
Modified:
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
(original)
+++
turbine/fulcrum/trunk/factory/src/java/org/apache/fulcrum/factory/DefaultFactoryService.java
Mon Oct 8 15:57:04 2018
@@ -69,10 +69,9 @@ public class DefaultFactoryService
/**
* Primitive classes for reflection of constructors.
*/
- private static HashMap<String, Class<?>> primitiveClasses;
+ private static HashMap<String, Class<?>> primitiveClasses = new
HashMap<String, Class<?>>(8);
{
- primitiveClasses = new HashMap<String, Class<?>>(8);
primitiveClasses.put(Boolean.TYPE.toString(), Boolean.TYPE);
primitiveClasses.put(Character.TYPE.toString(), Character.TYPE);
primitiveClasses.put(Byte.TYPE.toString(), Byte.TYPE);
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Mon Oct 8 15:57:04
2018
@@ -1,5 +1,5 @@
#HSQL Database Engine 1.8.0.10
-#Sun Oct 07 22:55:34 EDT 2018
+#Mon Oct 08 11:54:57 EDT 2018
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FileValidator.java
Mon Oct 8 15:57:04 2018
@@ -85,10 +85,13 @@ public class FileValidator
fileData = null;
}
- String content;
+ String content = null;
try
{
- content = new String(fileData, charset);
+ if ( fileData != null )
+ {
+ content = new String(fileData, charset);
+ }
}
catch (UnsupportedEncodingException e)
{
Modified: turbine/fulcrum/trunk/yaafi/contrib/TurbineYaafiComponentService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/contrib/TurbineYaafiComponentService.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/contrib/TurbineYaafiComponentService.java
(original)
+++ turbine/fulcrum/trunk/yaafi/contrib/TurbineYaafiComponentService.java Mon
Oct 8 15:57:04 2018
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.Log4JLogger;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
import
org.apache.fulcrum.yaafi.framework.factory.ServiceContainerConfiguration;
import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerFactory;
Modified:
turbine/fulcrum/trunk/yaafi/contrib/java/org/apache/fulcrum/yaafi/framework/configuration/CommonsConfigurationCCPResolver.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/contrib/java/org/apache/fulcrum/yaafi/framework/configuration/CommonsConfigurationCCPResolver.java?rev=1843165&r1=1843164&r2=1843165&view=diff
==============================================================================
---
turbine/fulcrum/trunk/yaafi/contrib/java/org/apache/fulcrum/yaafi/framework/configuration/CommonsConfigurationCCPResolver.java
(original)
+++
turbine/fulcrum/trunk/yaafi/contrib/java/org/apache/fulcrum/yaafi/framework/configuration/CommonsConfigurationCCPResolver.java
Mon Oct 8 15:57:04 2018
@@ -136,7 +136,7 @@ public class CommonsConfigurationCCPReso
PropertiesConfiguration prop = new
PropertiesConfiguration(confFile);
configuration.addConfiguration(prop);
}
- catch
(org.apache.commons.configuration.ConfigurationException e)
+ catch
(org.apache.commons.configuration2.ConfigurationException e)
{
throw new ConfigurationException("Property
Configuration could not be created", c, e);
}
@@ -170,7 +170,7 @@ public class CommonsConfigurationCCPReso
XMLConfiguration xml = new
XMLConfiguration(confFile);
configuration.addConfiguration(xml);
}
- catch
(org.apache.commons.configuration.ConfigurationException e)
+ catch
(org.apache.commons.configuration2.ConfigurationException e)
{
throw new ConfigurationException("XML
Configuration could not be created", c, e);
}
