HDFS-5352. Merge change r1532158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532159 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6f80868079
commit
e724cd97fe
|
@ -418,7 +418,11 @@ public class Server {
|
|||
Properties props = new Properties();
|
||||
try {
|
||||
InputStream is = getResource(DEFAULT_LOG4J_PROPERTIES);
|
||||
props.load(is);
|
||||
try {
|
||||
props.load(is);
|
||||
} finally {
|
||||
is.close();
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
throw new ServerException(ServerException.ERROR.S03, DEFAULT_LOG4J_PROPERTIES, ex.getMessage(), ex);
|
||||
}
|
||||
|
|
|
@ -96,6 +96,9 @@ Release 2.3.0 - UNRELEASED
|
|||
|
||||
HDFS-5266. ElasticByteBufferPool#Key does not implement equals. (cnauroth)
|
||||
|
||||
HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. (Ted Yu via
|
||||
jing9)
|
||||
|
||||
Release 2.2.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
Loading…
Reference in New Issue