You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/05/18 21:59:43 UTC
svn commit: r776067 -
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Mon May 18 19:59:43 2009
New Revision: 776067
URL: http://svn.apache.org/viewvc?rev=776067&view=rev
Log:
HBASE-1386 NPE in housekeeping -- part 2
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=776067&r1=776066&r2=776067&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Mon May 18 19:59:43 2009
@@ -1388,11 +1388,10 @@
* Data structure to hold a HMsg and retries count.
*/
private static final class ToDoEntry {
- protected volatile int tries;
+ protected final AtomicInteger tries = new AtomicInteger(0);
protected final HMsg msg;
ToDoEntry(final HMsg msg) {
- this.tries = 0;
this.msg = msg;
}
}
@@ -1487,9 +1486,9 @@
if (ex instanceof IOException) {
ex = RemoteExceptionHandler.checkIOException((IOException) ex);
}
- if(e != null && e.tries < numRetries) {
+ if(e != null && e.tries.get() < numRetries) {
LOG.warn(ex);
- e.tries++;
+ e.tries.incrementAndGet();
try {
toDo.put(e);
} catch (InterruptedException ie) {