HADOOP-11381. Fix findbugs warnings in hadoop-distcp, hadoop-aws, hadoop-azure, and hadoop-openstack. Contributed by Li Lu.

This commit is contained in:
Haohui Mai 2014-12-09 20:45:21 -08:00
parent c2514aaa83
commit a1e4a12dc0
5 changed files with 15 additions and 6 deletions

View File

@ -189,6 +189,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-11349. RawLocalFileSystem leaks file descriptor while creating a HADOOP-11349. RawLocalFileSystem leaks file descriptor while creating a
file if creat succeeds but chmod fails. (Varun Saxena via Colin P. McCabe) file if creat succeeds but chmod fails. (Varun Saxena via Colin P. McCabe)
HADOOP-11381. Fix findbugs warnings in hadoop-distcp, hadoop-aws,
hadoop-azure, and hadoop-openstack. (Li Lu via wheat9)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18

View File

@ -875,6 +875,8 @@ public class S3AFileSystem extends FileSystem {
case ProgressEvent.PART_COMPLETED_EVENT_CODE: case ProgressEvent.PART_COMPLETED_EVENT_CODE:
statistics.incrementWriteOps(1); statistics.incrementWriteOps(1);
break; break;
default:
break;
} }
} }
}; };
@ -933,6 +935,8 @@ public class S3AFileSystem extends FileSystem {
case ProgressEvent.PART_COMPLETED_EVENT_CODE: case ProgressEvent.PART_COMPLETED_EVENT_CODE:
statistics.incrementWriteOps(1); statistics.incrementWriteOps(1);
break; break;
default:
break;
} }
} }
}; };

View File

@ -27,6 +27,7 @@ import org.apache.hadoop.security.Credentials;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -74,7 +75,8 @@ public class FileBasedCopyListing extends CopyListing {
FileSystem fs = sourceListing.getFileSystem(getConf()); FileSystem fs = sourceListing.getFileSystem(getConf());
BufferedReader input = null; BufferedReader input = null;
try { try {
input = new BufferedReader(new InputStreamReader(fs.open(sourceListing))); input = new BufferedReader(new InputStreamReader(fs.open(sourceListing),
Charset.forName("UTF-8")));
String line = input.readLine(); String line = input.readLine();
while (line != null) { while (line != null) {
result.add(new Path(line)); result.add(new Path(line));

View File

@ -45,6 +45,7 @@ import java.io.InputStream;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -352,8 +353,8 @@ public class SwiftNativeFileSystemStore {
final CollectionType collectionType = JSONUtil.getJsonMapper().getTypeFactory(). final CollectionType collectionType = JSONUtil.getJsonMapper().getTypeFactory().
constructCollectionType(List.class, SwiftObjectFileStatus.class); constructCollectionType(List.class, SwiftObjectFileStatus.class);
final List<SwiftObjectFileStatus> fileStatusList = final List<SwiftObjectFileStatus> fileStatusList = JSONUtil.toObject(
JSONUtil.toObject(new String(bytes), collectionType); new String(bytes, Charset.forName("UTF-8")), collectionType);
//this can happen if user lists file /data/files/file //this can happen if user lists file /data/files/file
//in this case swift will return empty array //in this case swift will return empty array
@ -447,7 +448,7 @@ public class SwiftNativeFileSystemStore {
//no object location, return an empty list //no object location, return an empty list
return new LinkedList<URI>(); return new LinkedList<URI>();
} }
return extractUris(new String(objectLocation), path); return extractUris(new String(objectLocation, Charset.forName("UTF-8")), path);
} }
/** /**

View File

@ -219,9 +219,9 @@ public class SwiftTestUtils extends org.junit.Assert {
byte actual = dest[i]; byte actual = dest[i];
byte expected = src[i]; byte expected = src[i];
String letter = toChar(actual); String letter = toChar(actual);
String line = String.format("[%04d] %2x %s\n", i, actual, letter); String line = String.format("[%04d] %2x %s%n", i, actual, letter);
if (expected != actual) { if (expected != actual) {
line = String.format("[%04d] %2x %s -expected %2x %s\n", line = String.format("[%04d] %2x %s -expected %2x %s%n",
i, i,
actual, actual,
letter, letter,