Skip to content

Commit 2ce6d59

Browse files
committed
HADOOP-18117. fix yetus checkstyle
1 parent 7ffaf20 commit 2ce6d59

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,8 @@ public Builder withUseIterator(boolean useItr) {
795795
return this;
796796
}
797797

798-
public Builder withUpdateRootDirectoryAttributes(boolean updateRootDirectoryAttributes) {
799-
this.updateRootDirectoryAttributes = updateRootDirectoryAttributes;
798+
public Builder withUpdateRootDirectoryAttributes(boolean updateRootDirectoryAttrs) {
799+
this.updateRootDirectoryAttributes = updateRootDirectoryAttrs;
800800
return this;
801801
}
802802
}

hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,9 @@ private void preserveFileAttributesForDirectories(Configuration conf)
343343
//
344344
boolean skipRootDirectoryAttributes =
345345
syncOrOverwrite && !updateRootDirectoryAttributes;
346-
if (targetRoot.equals(targetFile) && skipRootDirectoryAttributes) continue;
346+
if (targetRoot.equals(targetFile) && skipRootDirectoryAttributes) {
347+
continue;
348+
}
347349

348350
FileSystem targetFS = targetFile.getFileSystem(conf);
349351
DistCpUtils.preserve(targetFS, targetFile, srcFileStatus, attributes,

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ public void testUpdateRootDirectoryAttributes() throws Exception {
569569

570570
// Create a source dir
571571
fs.mkdirs(source);
572-
fs.setOwner(source,"userA", "groupA");
572+
fs.setOwner(source, "userA", "groupA");
573573
fs.setTimes(source, new Random().nextLong(), new Random().nextLong());
574574

575575
GenericTestUtils.createFiles(fs, source, 3, 5, 5);

0 commit comments

Comments
 (0)