You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2010/02/26 01:55:13 UTC
svn commit: r916506 -
/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java
Author: jdcryans
Date: Fri Feb 26 00:55:13 2010
New Revision: 916506
URL: http://svn.apache.org/viewvc?rev=916506&view=rev
Log:
Reverting HBASE-2077 redux
Modified:
hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java
Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java?rev=916506&r1=916505&r2=916506&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/Leases.java Fri Feb 26 00:55:13 2010
@@ -90,19 +90,14 @@
if (lease == null) {
continue;
}
+ // A lease expired. Run the expired code before removing from queue
+ // since its presence in queue is used to see if lease exists still.
+ if (lease.getListener() == null) {
+ LOG.error("lease listener is null for lease " + lease.getLeaseName());
+ } else {
+ lease.getListener().leaseExpired();
+ }
synchronized (leaseQueue) {
- if (lease.getExpirationTime() <= System.currentTimeMillis()) {
- leaseQueue.add(lease);
- continue;
- }
- // A lease expired. Run the expired code before removing from queue
- // since its presence in queue is used to see if lease exists still.
- if (lease.getListener() == null) {
- LOG.error("lease listener is null for lease " + lease.getLeaseName());
- } else {
- lease.getListener().leaseExpired();
- }
-
leases.remove(lease.getLeaseName());
}
}