patches

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7953 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/yacy/yacyRelease.java

@@ -53,6 +53,7 @@ import net.yacy.cora.protocol.ResponseHeader;
 import net.yacy.cora.protocol.http.HTTPClient;
 import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.document.parser.html.ContentScraper;
+import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.io.CharBuffer;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.order.Base64Order;
@@ -234,7 +235,9 @@ public final class yacyRelease extends yacyVersion {
         // returns the version info if successful, null otherwise
         ContentScraper scraper;
         try {
-            scraper = Switchboard.getSwitchboard().loader.parseResource(location.getLocationURL(), CacheStrategy.NOCACHE);
+            final DigestURI uri = location.getLocationURL();
+            Thread.currentThread().setName("allReleaseFrom - host " + uri.getHost()); // makes it more easy to see which release blocks process in thread dump
+            scraper = Switchboard.getSwitchboard().loader.parseResource(uri, CacheStrategy.NOCACHE);
         } catch (final IOException e) {
             return null;
         }

source/net/yacy/kelondro/index/Row.java

@@ -171,7 +171,13 @@ public final class Row {
     public final Entry newEntry(final byte[] rowinstance, final int start, final boolean clone) {
         if (rowinstance == null) return null;
         //assert (rowinstance[0] != 0);
-        assert (this.objectOrder.wellformed(rowinstance, start, this.primaryKeyLength)) : "rowinstance = " + UTF8.String(rowinstance);
+        final boolean wellformed = this.objectOrder.wellformed(rowinstance, start, this.primaryKeyLength);
+        try {
+            assert (wellformed) : "rowinstance = " + UTF8.String(rowinstance);
+        } catch (final Throwable e) {
+            Log.logException(e);
+        }
+        if (!wellformed) return null;
         // this method offers the option to clone the content
         // this is necessary if it is known that the underlying byte array may change and therefore
         // the reference to the byte array does not contain the original content