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

HADOOP-11494. Lock acquisition on WrappedInputStream#unwrappedRpcBuffer may race with another thread. Contributed by Ted Yu. 

(cherry picked from commit 3472e3bd6c)
This commit is contained in:
Benoy Antony 2015-02-02 10:34:47 -08:00
parent 648510e031
commit f3ed5b68ca
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
View File

@ -573,17 +573,15 @@ public class SaslRpcClient {
} }
@Override @Override
public int read(byte[] buf, int off, int len) throws IOException { public synchronized int read(byte[] buf, int off, int len) throws IOException {
synchronized(unwrappedRpcBuffer) { // fill the buffer with the next RPC message
// fill the buffer with the next RPC message if (unwrappedRpcBuffer.remaining() == 0) {
if (unwrappedRpcBuffer.remaining() == 0) { readNextRpcPacket();
readNextRpcPacket();
}
// satisfy as much of the request as possible
int readLen = Math.min(len, unwrappedRpcBuffer.remaining());
unwrappedRpcBuffer.get(buf, off, readLen);
return readLen;
} }
// satisfy as much of the request as possible
int readLen = Math.min(len, unwrappedRpcBuffer.remaining());
unwrappedRpcBuffer.get(buf, off, readLen);
return readLen;
} }
// all messages must be RPC SASL wrapped, else an exception is thrown // all messages must be RPC SASL wrapped, else an exception is thrown