Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10296. Incorrect null check in SwiftRestClient#buildException(). Contributed by Rahul Palamuttam and Kanaka Kumar Avvaru. 

(cherry picked from commit ecbfd68974)
This commit is contained in:
Akira Ajisaka 2015-10-01 18:25:31 +02:00
parent e42f576232
commit c6f30e5913
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -598,6 +598,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12448. TestTextCommand: use mkdirs rather than mkdir to create test
directory. (Contributed by Colin Patrick McCabe and Chris Nauroth)
HADOOP-10296. Incorrect null check in SwiftRestClient#buildException().
(Rahul Palamuttam and Kanaka Kumar Avvaru via aajisaka)
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

20
hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/http/SwiftRestClient.java
View File

@ -172,8 +172,6 @@ public final class SwiftRestClient {
*/
private URI objectLocationURI;
private final URI filesystemURI;
/**
* The name of the service provider
*/
@ -237,13 +235,6 @@ public final class SwiftRestClient {
return endpointURI;
}
/**
* object location endpoint
*/
private synchronized URI getObjectLocationURI() {
return objectLocationURI;
}
/**
* token for Swift communication
*/
@ -331,13 +322,6 @@ public final class SwiftRestClient {
}
}
private static abstract class PostMethodProcessor<R> extends HttpMethodProcessor<PostMethod, R> {
@Override
protected final PostMethod doCreateMethod(String uri) {
return new PostMethod(uri);
}
}
/**
* There's a special type for auth messages, so that low-level
* message handlers can react to auth failures differently from everything
@ -449,7 +433,6 @@ public final class SwiftRestClient {
private SwiftRestClient(URI filesystemURI,
Configuration conf)
throws SwiftConfigurationException {
this.filesystemURI = filesystemURI;
Properties props = RestClientBindings.bind(filesystemURI, conf);
String stringAuthUri = getOption(props, SWIFT_AUTH_PROPERTY);
username = getOption(props, SWIFT_USERNAME_PROPERTY);
@ -1129,7 +1112,6 @@ public final class SwiftRestClient {
final List<Catalog> serviceCatalog = access.getServiceCatalog();
//locate the specific service catalog that defines Swift; variations
//in the name of this add complexity to the search
boolean catalogMatch = false;
StringBuilder catList = new StringBuilder();
StringBuilder regionList = new StringBuilder();
@ -1470,7 +1452,7 @@ public final class SwiftRestClient {
//and the result
Header availableContentRange = method.getResponseHeader(
HEADER_CONTENT_RANGE);
if (requestContentLen!=null) {
if (availableContentRange != null) {
errorText.append(" available ").append(availableContentRange.getValue());
}
fault = new EOFException(errorText.toString());