Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
fjy 2014-01-14 09:54:49 -08:00
commit 82cf380bd4
2 changed files with 8 additions and 1 deletions

View File

@ -40,7 +40,12 @@ public class ServerTimeRejectionPolicyFactory implements RejectionPolicyFactory
@Override
public boolean accept(long timestamp)
{
return timestamp >= (System.currentTimeMillis() - windowMillis);
long now = System.currentTimeMillis();
boolean notTooOld = timestamp >= (now - windowMillis);
boolean notTooYoung = timestamp <= (now + windowMillis);
return notTooOld && notTooYoung;
}
@Override

View File

@ -37,8 +37,10 @@ public class ServerTimeRejectionPolicyFactoryTest
DateTime now = new DateTime();
DateTime past = now.minus(period).minus(1);
DateTime future = now.plus(period).plus(1);
Assert.assertTrue(rejectionPolicy.accept(now.getMillis()));
Assert.assertFalse(rejectionPolicy.accept(past.getMillis()));
Assert.assertFalse(rejectionPolicy.accept(future.getMillis()));
}
}