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

This commit is contained in:
fjy 2014-05-12 11:38:55 -07:00
commit c57a18d6b6
2 changed files with 2 additions and 2 deletions

View File

@ -106,7 +106,7 @@ public class DatabaseSegmentManager
final Duration delay = config.get().getPollDuration().toStandardDuration();
ScheduledExecutors.scheduleWithFixedDelay(
exec,
delay,
new Duration(0),
delay,
new Runnable()
{

View File

@ -106,7 +106,7 @@ public class DatabaseSegmentManagerTest
@Test
public void testPoll()
{
EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows);
EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows).times(2);
EasyMock.replay(dbi);
manager.start();