You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/05/20 14:19:43 UTC
svn commit: r1744746 - in
/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:
cli/Digest.java digest/Md5Crypt.java digest/PureJavaCrc32C.java
digest/Sha2Crypt.java language/MatchRatingApproachEncoder.java
Author: sebb
Date: Fri May 20 14:19:43 2016
New Revision: 1744746
URL: http://svn.apache.org/viewvc?rev=1744746&view=rev
Log:
FindBugs
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java?rev=1744746&r1=1744745&r2=1744746&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/cli/Digest.java Fri May 20 14:19:43 2016
@@ -119,7 +119,10 @@ public class Digest {
if (file.isFile()) {
println(prefix, DigestUtils.digest(messageDigest, file), source);
} else if (file.isDirectory()) {
- run(prefix, messageDigest, file.listFiles());
+ final File[] listFiles = file.listFiles();
+ if (listFiles != null) {
+ run(prefix, messageDigest, listFiles);
+ }
} else {
// use the default charset for the command-line parameter
final byte[] bytes = source.getBytes(Charset.defaultCharset());
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java?rev=1744746&r1=1744745&r2=1744746&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Md5Crypt.java Fri May 20 14:19:43 2016
@@ -186,7 +186,7 @@ public class Md5Crypt {
} else {
final Pattern p = Pattern.compile("^" + prefix.replace("$", "\\$") + "([\\.\\/a-zA-Z0-9]{1,8}).*");
final Matcher m = p.matcher(salt);
- if (m == null || !m.find()) {
+ if (!m.find()) {
throw new IllegalArgumentException("Invalid salt value: " + salt);
}
saltString = m.group(1);
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java?rev=1744746&r1=1744745&r2=1744746&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32C.java Fri May 20 14:19:43 2016
@@ -90,7 +90,7 @@ public class PureJavaCrc32C implements C
case 2: localCrc = (localCrc >>> 8) ^ T[T8_0_start + ((localCrc ^ b[off++]) & 0xff)];
case 1: localCrc = (localCrc >>> 8) ^ T[T8_0_start + ((localCrc ^ b[off++]) & 0xff)];
default:
- /* nothing */
+ break; // satisfy Findbugs
}
// Publish crc out to object
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java?rev=1744746&r1=1744745&r2=1744746&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java Fri May 20 14:19:43 2016
@@ -143,7 +143,7 @@ public class Sha2Crypt {
}
final Matcher m = SALT_PATTERN.matcher(salt);
- if (m == null || !m.find()) {
+ if (!m.find()) {
throw new IllegalArgumentException("Invalid salt value: " + salt);
}
if (m.group(3) != null) {
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java?rev=1744746&r1=1744745&r2=1744746&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java Fri May 20 14:19:43 2016
@@ -185,9 +185,9 @@ public class MatchRatingApproachEncoder
if (sumLength <= FOUR) {
minRating = FIVE;
- } else if (sumLength >= FIVE && sumLength <= SEVEN) {
+ } else if (sumLength <= SEVEN) { // aready know it is at least 5
minRating = FOUR;
- } else if (sumLength >= EIGHT && sumLength <= ELEVEN) {
+ } else if (sumLength <= ELEVEN) { // aready know it is at least 8
minRating = THREE;
} else if (sumLength == TWELVE) {
minRating = TWO;