From f5a4efb76ea8373bb5e1d6417ad731fbac9234b4 Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 20 Jul 2007 08:06:21 +0000 Subject: [PATCH] fix for http://forum.yacy-websuche.de/viewtopic.php?f=6&t=192&hilit=&p=1034#p1034 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3996 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/yacy/hello.java | 2 +- source/de/anomic/kelondro/kelondroAbstractOrder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index c7f46d429..0ba2f8b99 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -87,7 +87,7 @@ public final class hello { final yacySeed remoteSeed = yacySeed.genRemoteSeed(seed, key, false); // System.out.println("YACYHELLO: REMOTESEED=" + ((remoteSeed == null) ? "NULL" : remoteSeed.toString())); - if (remoteSeed == null) { return null; } + if ((remoteSeed == null) || (remoteSeed.hash == null)) { return null; } // final String properTest = remoteSeed.isProper(); // The remote peer might not know its IP yet, so don't abort if the IP check fails diff --git a/source/de/anomic/kelondro/kelondroAbstractOrder.java b/source/de/anomic/kelondro/kelondroAbstractOrder.java index b67873536..8abfab84c 100644 --- a/source/de/anomic/kelondro/kelondroAbstractOrder.java +++ b/source/de/anomic/kelondro/kelondroAbstractOrder.java @@ -75,7 +75,7 @@ public abstract class kelondroAbstractOrder implements kelondroOrder { } /* else if ((a instanceof Integer) && (b instanceof Integer)) { return ((Integer) a).compareTo((Integer) b); } */ else - throw new IllegalArgumentException("Object type or Object type combination not supported: a=" + a + "[" + a.getClass().getName() + "], b=" + b + "[" + b.getClass().getName() + "]"); + throw new IllegalArgumentException("Object type or Object type combination not supported: a=" + a + "[" + ((a == null) ? "" : a.getClass().getName()) + "], b=" + b + "[" + ((b == null) ? "" : b.getClass().getName()) + "]"); } public byte[] zero() {