HDFS-4013. TestHftpURLTimeouts throws NPE. Contributed by Chao Shi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455755 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
57803245ec
commit
c5017c71e4
|
@ -391,6 +391,8 @@ Release 2.0.5-beta - UNRELEASED
|
|||
HDFS-4571. WebHDFS should not set the service hostname on the server side.
|
||||
(tucu)
|
||||
|
||||
HDFS-4013. TestHftpURLTimeouts throws NPE. (Chao Shi via suresh)
|
||||
|
||||
Release 2.0.4-alpha - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
package org.apache.hadoop.hdfs;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.IOException;
|
||||
|
@ -39,7 +40,7 @@ import org.junit.Test;
|
|||
public class TestHftpURLTimeouts {
|
||||
@BeforeClass
|
||||
public static void setup() {
|
||||
URLUtils.SOCKET_TIMEOUT = 1;
|
||||
URLUtils.SOCKET_TIMEOUT = 5;
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -116,6 +117,7 @@ public class TestHftpURLTimeouts {
|
|||
conns.add(fs.openConnection("/", ""));
|
||||
} catch (SocketTimeoutException ste) {
|
||||
String message = ste.getMessage();
|
||||
assertNotNull(message);
|
||||
// https will get a read timeout due to SSL negotiation, but
|
||||
// a normal http will not, so need to ignore SSL read timeouts
|
||||
// until a connect timeout occurs
|
||||
|
|
Loading…
Reference in New Issue