This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 3969327 HADOOP-12940. Fix warnings from Spotbugs in hadoop-common.
3969327 is described below
commit 396932707701784e0c16903d01e14a27894495c7
Author: Akira Ajisaka <aajis...@apache.org>
AuthorDate: Fri Jun 23 10:28:58 2017 +0900
HADOOP-12940. Fix warnings from Spotbugs in hadoop-common.
Conflicts:
hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java
---
.../server/MultiSchemeAuthenticationHandler.java | 11 ++++----
.../dev-support/findbugsExcludeFile.xml | 32 ++++++++++++++++++++++
.../main/java/org/apache/hadoop/fs/FileUtil.java | 6 ++--
.../org/apache/hadoop/fs/RawLocalFileSystem.java | 17 +++++++-----
.../hadoop/fs/shell/CommandWithDestination.java | 2 +-
.../java/org/apache/hadoop/io/DoubleWritable.java | 4 +--
.../java/org/apache/hadoop/io/FloatWritable.java | 6 ++--
.../main/java/org/apache/hadoop/io/IOUtils.java | 9 ++++--
.../org/apache/hadoop/io/file/tfile/Utils.java | 2 +-
.../delegation/ZKDelegationTokenSecretManager.java | 8 ++----
.../org/apache/hadoop/util/SysInfoWindows.java | 6 ++--
.../java/org/apache/hadoop/minikdc/MiniKdc.java | 7 +++--
12 files changed, 74 insertions(+), 36 deletions(-)
diff --git
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
index aa49100..58a0adb 100644
---
a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
+++
b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
@@ -186,11 +186,12 @@ public class MultiSchemeAuthenticationHandler implements
String authorization =
request.getHeader(HttpConstants.AUTHORIZATION_HEADER);
if (authorization != null) {
- for (String scheme : schemeToAuthHandlerMapping.keySet()) {
- if (AuthenticationHandlerUtil.matchAuthScheme(scheme, authorization)) {
- AuthenticationHandler handler =
- schemeToAuthHandlerMapping.get(scheme);
- AuthenticationToken token = handler.authenticate(request, response);
+ for (Map.Entry<String, AuthenticationHandler> entry :
+ schemeToAuthHandlerMapping.entrySet()) {
+ if (AuthenticationHandlerUtil.matchAuthScheme(
+ entry.getKey(), authorization)) {
+ AuthenticationToken token =
+ entry.getValue().authenticate(request, response);
logger.trace("Token generated with type {}", token.getType());
return token;
}
diff --git
a/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
b/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
index 6f1942e..bc11c15 100644
--- a/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
@@ -421,4 +421,36 @@
<Filed name="done"/>
<Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/>
</Match>
+
+ <Match>
+ <Class name="org.apache.hadoop.metrics2.impl.MetricsConfig"/>
+ <Method name="toString"/>
+ <Bug pattern="DM_DEFAULT_ENCODING"/>
+ </Match>
+
+ <!-- We need to make the methods public because PBHelperClient calls them.
-->
+ <Match>
+ <Class name="org.apache.hadoop.crypto.CipherSuite"/>
+ <Method name="setUnknownValue"/>
+ <Bug pattern="ME_ENUM_FIELD_SETTER"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.crypto.CryptoProtocolVersion"/>
+ <Method name="setUnknownValue"/>
+ <Bug pattern="ME_ENUM_FIELD_SETTER"/>
+ </Match>
+
+ <!-- We need to make the method public for testing. -->
+ <Match>
+ <Class name="org.apache.hadoop.metrics2.lib.DefaultMetricsSystem"/>
+ <Method name="setMiniClusterMode"/>
+ <Bug pattern="ME_ENUM_FIELD_SETTER"/>
+ </Match>
+
+ <!-- Experimental interface. Ignore. -->
+ <Match>
+ <Class name="org.apache.hadoop.metrics2.lib.DefaultMetricsFactory"/>
+ <Method name="setInstance"/>
+ <Bug pattern="ME_ENUM_FIELD_SETTER"/>
+ </Match>
</FindBugsFilter>
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
index 4e699d2..1a4ae9a 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
@@ -115,8 +115,10 @@ public class FileUtil {
file.deleteOnExit();
if (file.isDirectory()) {
File[] files = file.listFiles();
- for (File child : files) {
- fullyDeleteOnExit(child);
+ if (files != null) {
+ for (File child : files) {
+ fullyDeleteOnExit(child);
+ }
}
}
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 6c5f938..a12a350 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -380,13 +380,16 @@ public class RawLocalFileSystem extends FileSystem {
// again.
try {
FileStatus sdst = this.getFileStatus(dst);
- if (sdst.isDirectory() && dstFile.list().length == 0) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Deleting empty destination and renaming " + src + " to " +
- dst);
- }
- if (this.delete(dst, false) && srcFile.renameTo(dstFile)) {
- return true;
+ String[] dstFileList = dstFile.list();
+ if (dstFileList != null) {
+ if (sdst.isDirectory() && dstFileList.length == 0) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Deleting empty destination and renaming " + src +
+ " to " + dst);
+ }
+ if (this.delete(dst, false) && srcFile.renameTo(dstFile)) {
+ return true;
+ }
}
}
} catch (FileNotFoundException ignored) {
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
index 2ab0a26..8f0014b 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
@@ -501,7 +501,7 @@ abstract class CommandWithDestination extends FsCommand {
createFlags,
getConf().getInt(IO_FILE_BUFFER_SIZE_KEY,
IO_FILE_BUFFER_SIZE_DEFAULT),
- lazyPersist ? 1 : getDefaultReplication(item.path),
+ (short) 1,
getDefaultBlockSize(),
null,
null);
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
index 5cc326f..f45ed0a 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
@@ -75,7 +75,7 @@ public class DoubleWritable implements
WritableComparable<DoubleWritable> {
@Override
public int compareTo(DoubleWritable o) {
- return (value < o.value ? -1 : (value == o.value ? 0 : 1));
+ return Double.compare(value, o.value);
}
@Override
@@ -94,7 +94,7 @@ public class DoubleWritable implements
WritableComparable<DoubleWritable> {
byte[] b2, int s2, int l2) {
double thisValue = readDouble(b1, s1);
double thatValue = readDouble(b2, s2);
- return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
+ return Double.compare(thisValue, thatValue);
}
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
index 21e4cc4..367fc94 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
@@ -66,9 +66,7 @@ public class FloatWritable implements
WritableComparable<FloatWritable> {
/** Compares two FloatWritables. */
@Override
public int compareTo(FloatWritable o) {
- float thisValue = this.value;
- float thatValue = o.value;
- return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
+ return Float.compare(value, o.value);
}
@Override
@@ -86,7 +84,7 @@ public class FloatWritable implements
WritableComparable<FloatWritable> {
byte[] b2, int s2, int l2) {
float thisValue = readFloat(b1, s1);
float thatValue = readFloat(b2, s2);
- return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
+ return Float.compare(thisValue, thatValue);
}
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
index e765d6b..fc62775 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
@@ -386,9 +386,12 @@ public class IOUtils {
try (DirectoryStream<Path> stream =
Files.newDirectoryStream(dir.toPath())) {
for (Path entry: stream) {
- String fileName = entry.getFileName().toString();
- if ((filter == null) || filter.accept(dir, fileName)) {
- list.add(fileName);
+ Path fileName = entry.getFileName();
+ if (fileName != null) {
+ String fileNameStr = fileName.toString();
+ if ((filter == null) || filter.accept(dir, fileNameStr)) {
+ list.add(fileNameStr);
+ }
}
}
} catch (DirectoryIteratorException e) {
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
index 5743c66..8cb6e0d 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
@@ -395,7 +395,7 @@ public final class Utils {
@Override
public int hashCode() {
- return (major << 16 + minor);
+ return (major << 16) + minor;
}
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index 4a7ddb2..88bd29b 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -881,11 +881,9 @@ public abstract class
ZKDelegationTokenSecretManager<TokenIdent extends Abstract
String nodeCreatePath =
getNodePath(ZK_DTSM_TOKENS_ROOT, DELEGATION_TOKEN_PREFIX
+ ident.getSequenceNumber());
- ByteArrayOutputStream tokenOs = new ByteArrayOutputStream();
- DataOutputStream tokenOut = new DataOutputStream(tokenOs);
- ByteArrayOutputStream seqOs = new ByteArrayOutputStream();
- try {
+ try (ByteArrayOutputStream tokenOs = new ByteArrayOutputStream();
+ DataOutputStream tokenOut = new DataOutputStream(tokenOs)) {
ident.write(tokenOut);
tokenOut.writeLong(info.getRenewDate());
tokenOut.writeInt(info.getPassword().length);
@@ -902,8 +900,6 @@ public abstract class
ZKDelegationTokenSecretManager<TokenIdent extends Abstract
zkClient.create().withMode(CreateMode.PERSISTENT)
.forPath(nodeCreatePath, tokenOs.toByteArray());
}
- } finally {
- seqOs.close();
}
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
index 2007ab3..ffa2b65 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
@@ -170,7 +170,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
- public int getNumProcessors() {
+ public synchronized int getNumProcessors() {
refreshIfNeeded();
return numProcessors;
}
@@ -197,7 +197,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
- public float getCpuUsagePercentage() {
+ public synchronized float getCpuUsagePercentage() {
refreshIfNeeded();
float ret = cpuUsage;
if (ret != -1) {
@@ -208,7 +208,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
- public float getNumVCoresUsed() {
+ public synchronized float getNumVCoresUsed() {
refreshIfNeeded();
float ret = cpuUsage;
if (ret != -1) {
diff --git
a/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
b/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
index c90f96d..e1f31be 100644
---
a/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
+++
b/hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
@@ -512,8 +512,11 @@ public class MiniKdc {
LOG.warn("WARNING: cannot delete file " + f.getAbsolutePath());
}
} else {
- for (File c: f.listFiles()) {
- delete(c);
+ File[] fileList = f.listFiles();
+ if (fileList != null) {
+ for (File c : fileList) {
+ delete(c);
+ }
}
if (! f.delete()) {
LOG.warn("WARNING: cannot delete directory " + f.getAbsolutePath());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
