diff --git a/source/de/anomic/crawler/Balancer.java b/source/de/anomic/crawler/Balancer.java index 8454bdebc..52ae85e4d 100644 --- a/source/de/anomic/crawler/Balancer.java +++ b/source/de/anomic/crawler/Balancer.java @@ -451,16 +451,16 @@ public class Balancer { // this is only to protection against the worst case, where the crawler could // behave in a DoS-manner Log.logInfo("BALANCER", "forcing crawl-delay of " + sleeptime + " milliseconds for " + crawlEntry.url().getHost() + ": " + Latency.waitingRemainingExplain(crawlEntry.url(), minimumLocalDelta, minimumGlobalDelta) + ", top.size() = " + top.size() + ", delayed.size() = " + delayed.size() + ", domainStacks.size() = " + domainStacks.size() + ", domainStacksInitSize = " + this.domStackInitSize); - long loops = sleeptime / 3000; - long rest = sleeptime % 3000; + long loops = sleeptime / 1000; + long rest = sleeptime % 1000; if (loops < 2) { - rest = rest + 3000 * loops; + rest = rest + 1000 * loops; loops = 0; } - if (rest > 0) {try {synchronized(this) { this.wait(rest); }} catch (final InterruptedException e) {}} + if (rest > 0) {try {this.wait(rest); } catch (final InterruptedException e) {}} for (int i = 0; i < loops; i++) { Log.logInfo("BALANCER", "waiting for " + crawlEntry.url().getHost() + ": " + ((loops - i) * 3) + " seconds remaining..."); - try {synchronized(this) { this.wait(3000); }} catch (final InterruptedException e) {} + try {this.wait(1000); } catch (final InterruptedException e) {} } } this.ddc.remove(crawlEntry.url().hash()); diff --git a/source/net/yacy/cora/protocol/Domains.java b/source/net/yacy/cora/protocol/Domains.java index 599b6ee35..1734a61ad 100644 --- a/source/net/yacy/cora/protocol/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -532,9 +532,11 @@ public class Domains { return null; } + private final static Pattern dotPattern = Pattern.compile("\\."); + private static final InetAddress parseInetAddress(final String ip) { if (ip == null || ip.length() < 8) return null; - final String[] ips = ip.split("\\."); + final String[] ips = dotPattern.split(ip); if (ips.length != 4) return null; final byte[] ipb = new byte[4]; try { diff --git a/source/net/yacy/kelondro/logging/ThreadDump.java b/source/net/yacy/kelondro/logging/ThreadDump.java index 33b1d6aa5..81755cb8c 100644 --- a/source/net/yacy/kelondro/logging/ThreadDump.java +++ b/source/net/yacy/kelondro/logging/ThreadDump.java @@ -47,7 +47,7 @@ public class ThreadDump extends HashMap> imp private static final long serialVersionUID = -5587850671040354397L; - private static final String multiDumpFilter = ".*((java.net.DatagramSocket.receive)|(java.lang.Thread.getAllStackTraces)|(java.net.SocketInputStream.read)|(java.net.ServerSocket.accept)).*"; + private static final String multiDumpFilter = ".*((java.net.DatagramSocket.receive)|(java.lang.Thread.getAllStackTraces)|(java.net.SocketInputStream.read)|(java.net.ServerSocket.accept)|(java.net.Socket.connect)).*"; private static final Pattern multiDumpFilterPattern = Pattern.compile(multiDumpFilter); public static class StackTrace {