Merge branch 'master' of ssh://gitorious.org/yacy/rc1

Conflicts:
	source/de/anomic/crawler/CrawlQueues.java
pull/1/head
Michael Christen 13 years ago
commit e5d878c59e

@ -217,9 +217,8 @@ public class CrawlQueues {
public int coreCrawlJobSize() { public int coreCrawlJobSize() {
return this.noticeURL.stackSize(NoticedURL.StackType.CORE) + this.noticeURL.stackSize(NoticedURL.StackType.NOLOAD); return this.noticeURL.stackSize(NoticedURL.StackType.CORE) + this.noticeURL.stackSize(NoticedURL.StackType.NOLOAD);
} }
public boolean coreCrawlJob() {
public boolean coreCrawlJob() {
final boolean robinsonPrivateCase = (this.sb.isRobinsonMode() && final boolean robinsonPrivateCase = (this.sb.isRobinsonMode() &&
!this.sb.getConfig(SwitchboardConstants.CLUSTER_MODE, "").equals(SwitchboardConstants.CLUSTER_MODE_PUBLIC_CLUSTER)); !this.sb.getConfig(SwitchboardConstants.CLUSTER_MODE, "").equals(SwitchboardConstants.CLUSTER_MODE_PUBLIC_CLUSTER));
@ -704,6 +703,5 @@ public class CrawlQueues {
assert w != null; assert w != null;
} }
} }
}
}
} }

Loading…
Cancel
Save