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

HBASE-9232 Fix javadoc warning and a few findbugs items

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1514309 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-08-15 14:59:00 +00:00
parent 1fe8c622c9
commit 58ee2bbf24
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCaller.java
View File

@ -66,7 +66,7 @@ public class RpcRetryingCaller<T> {
private final int retries; private final int retries;
public RpcRetryingCaller(Configuration conf) { public RpcRetryingCaller(Configuration conf) {
this.pause = conf.getLong(HConstants.HBASE_CLIENT_PAUSE, this.pause = conf.getLong(HConstants.HBASE_CLIENT_PAUSE,
HConstants.DEFAULT_HBASE_CLIENT_PAUSE); HConstants.DEFAULT_HBASE_CLIENT_PAUSE);
this.retries = this.retries =
conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, conf.getInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER,
@ -224,4 +224,4 @@ public class RpcRetryingCaller<T> {
} }
return t; return t;
} }
} }

18
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
View File

@ -466,6 +466,8 @@ public class RpcClient {
* It is up to the user code to check this status. * It is up to the user code to check this status.
* @param call to add * @param call to add
*/ */
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NN_NAKED_NOTIFY",
justification="Notify because new call available for processing")
protected synchronized void addCall(Call call) { protected synchronized void addCall(Call call) {
// If the connection is about to close, we manage this as if the call was already added // If the connection is about to close, we manage this as if the call was already added
// to the connection calls list. If not, the connection creations are serialized, as // to the connection calls list. If not, the connection creations are serialized, as
@ -1149,6 +1151,8 @@ public class RpcClient {
cleanupCalls(0); cleanupCalls(0);
} }
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NN_NAKED_NOTIFY",
justification="Notify because timedout")
protected void cleanupCalls(long rpcTimeout) { protected void cleanupCalls(long rpcTimeout) {
Iterator<Entry<Integer, Call>> itor = calls.entrySet().iterator(); Iterator<Entry<Integer, Call>> itor = calls.entrySet().iterator();
while (itor.hasNext()) { while (itor.hasNext()) {
@ -1184,9 +1188,7 @@ public class RpcClient {
} }
if (!shouldCloseConnection.get()) { if (!shouldCloseConnection.get()) {
closeException = null; closeException = null;
if (socket != null) { setSocketTimeout(socket, (int) rpcTimeout);
socket.setSoTimeout((int) rpcTimeout);
}
} }
} catch (SocketException e) { } catch (SocketException e) {
LOG.debug("Couldn't lower timeout, which may result in longer than expected calls"); LOG.debug("Couldn't lower timeout, which may result in longer than expected calls");
@ -1194,6 +1196,14 @@ public class RpcClient {
} }
} }
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IS2_INCONSISTENT_SYNC",
justification="Presume sync not needed setting socket timeout")
private static void setSocketTimeout(final Socket socket, final int rpcTimeout)
throws java.net.SocketException {
if (socket == null) return;
socket.setSoTimeout(rpcTimeout);
}
/** /**
* Client-side call timeout * Client-side call timeout
*/ */
@ -1649,4 +1659,4 @@ public class RpcClient {
this.isa, this.rpcTimeout); this.isa, this.rpcTimeout);
} }
} }
} }

2
hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java
View File

@ -310,6 +310,8 @@ public class TablePermission extends Permission {
} }
@Override @Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_NULL_ON_SOME_PATH",
justification="Passed on construction except on constructor not to be used")
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof TablePermission)) { if (!(obj instanceof TablePermission)) {
return false; return false;