From 4ec0092677e57e159c43b1c138b1b1d0a243849d Mon Sep 17 00:00:00 2001 From: hermens Date: Sat, 10 Apr 2010 18:31:12 +0000 Subject: [PATCH] more null == proxy fixes git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6794 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/IndexCreateParserErrors_p.java | 4 ++-- source/de/anomic/crawler/ZURL.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htroot/IndexCreateParserErrors_p.java b/htroot/IndexCreateParserErrors_p.java index f535710fd..79704592a 100644 --- a/htroot/IndexCreateParserErrors_p.java +++ b/htroot/IndexCreateParserErrors_p.java @@ -83,8 +83,8 @@ public class IndexCreateParserErrors_p { initiatorHash = entry.initiator(); executorHash = entry.executor(); - initiatorSeed = sb.peers.getConnected(new String(initiatorHash)); - executorSeed = sb.peers.getConnected(new String(executorHash)); + initiatorSeed = (initiatorHash == null) ? null : sb.peers.getConnected(new String(initiatorHash)); + executorSeed = (executorHash == null) ? null : sb.peers.getConnected(new String(executorHash)); prop.putHTML("rejected_list_"+j+"_initiator", ((initiatorSeed == null) ? "proxy" : initiatorSeed.getName())); prop.putHTML("rejected_list_"+j+"_executor", ((executorSeed == null) ? "proxy" : executorSeed.getName())); prop.putHTML("rejected_list_"+j+"_url", url.toNormalform(false, true)); diff --git a/source/de/anomic/crawler/ZURL.java b/source/de/anomic/crawler/ZURL.java index 28237abc0..72875f4e6 100755 --- a/source/de/anomic/crawler/ZURL.java +++ b/source/de/anomic/crawler/ZURL.java @@ -126,7 +126,7 @@ public class ZURL implements Iterable { final Date workdate, final int workcount, String anycause) { - assert executor != null; + // assert executor != null; // null == proxy ! if (exists(bentry.url().hash())) return; // don't insert double causes if (anycause == null) anycause = "unknown"; Entry entry = new Entry(bentry, executor, workdate, workcount, anycause); @@ -232,7 +232,7 @@ public class ZURL implements Iterable { final String anycause) { // create new entry assert bentry != null; - assert executor != null; + // assert executor != null; // null == proxy ! this.bentry = bentry; this.executor = executor; this.workdate = (workdate == null) ? new Date() : workdate;