Browse Source

HADOOP-9144. Fix findbugs warnings. Contribute by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-trunk-win@1422275 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 12 years ago
parent
commit
3bb27e0bd5

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt

@@ -62,3 +62,5 @@ branch-trunk-win changes - unreleased
 
   HADOOP-9056. Build native library on Windows. (Chuan Liu, Arpit Agarwal via
   suresh)
+
+  HADOOP-9144. Fix findbugs warnings. (Chris Nauroth via suresh)

+ 3 - 3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java

@@ -694,7 +694,7 @@ public class FileUtil {
     rv = f.setReadable(group.implies(FsAction.READ), false);
     checkReturnValue(rv, f, permission);
     if (group.implies(FsAction.READ) != user.implies(FsAction.READ)) {
-      f.setReadable(user.implies(FsAction.READ), true);
+      rv = f.setReadable(user.implies(FsAction.READ), true);
       checkReturnValue(rv, f, permission);
     }
 
@@ -702,7 +702,7 @@ public class FileUtil {
     rv = f.setWritable(group.implies(FsAction.WRITE), false);
     checkReturnValue(rv, f, permission);
     if (group.implies(FsAction.WRITE) != user.implies(FsAction.WRITE)) {
-      f.setWritable(user.implies(FsAction.WRITE), true);
+      rv = f.setWritable(user.implies(FsAction.WRITE), true);
       checkReturnValue(rv, f, permission);
     }
 
@@ -710,7 +710,7 @@ public class FileUtil {
     rv = f.setExecutable(group.implies(FsAction.EXECUTE), false);
     checkReturnValue(rv, f, permission);
     if (group.implies(FsAction.EXECUTE) != user.implies(FsAction.EXECUTE)) {
-      f.setExecutable(user.implies(FsAction.EXECUTE), true);
+      rv = f.setExecutable(user.implies(FsAction.EXECUTE), true);
       checkReturnValue(rv, f, permission);
     }
   }

+ 2 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java

@@ -202,8 +202,8 @@ public class Path implements Comparable {
     if (WINDOWS &&
         (hasWindowsDrive(path) ||
          (scheme == null) ||
-         (scheme == "") ||
-         (scheme == "file"))) {
+         (scheme.isEmpty()) ||
+         (scheme.equals("file")))) {
       path = StringUtils.replace(path, "\\", "/");
     }