From e717bf74baaa6b6da78b8e16ce928484b6b9f8cf Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 21 Feb 2011 09:51:05 +0000 Subject: [PATCH] more logging, more care about OOMs git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7503 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/net/yacy/document/SnippetExtractor.java | 2 +- source/net/yacy/document/parser/html/ContentScraper.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/net/yacy/document/SnippetExtractor.java b/source/net/yacy/document/SnippetExtractor.java index 03ab4cd99..58b15f493 100644 --- a/source/net/yacy/document/SnippetExtractor.java +++ b/source/net/yacy/document/SnippetExtractor.java @@ -166,7 +166,7 @@ public class SnippetExtractor { assert maxpos >= minpos; final int newlen = Math.max(10, maxpos - minpos + 10); final int around = (maxLength - newlen) / 2; - assert minpos - around < sentence.length() : "maxpos = " + maxpos + ", minpos = " + minpos + ", around = " + around + ", sentence.length() = " + sentence.length(); //maxpos = 435, minpos = 17, around = -124, sentence.length() = 44 + assert minpos - around < sentence.length() : "maxpos = " + maxpos + ", minpos = " + minpos + ", around = " + around + ", sentence.length() = " + sentence.length() + ", maxLength = " + maxLength + ", newlen = " + newlen; //maxpos = 435, minpos = 17, around = -124, sentence.length() = 44 sentence = "[..] " + sentence.substring(minpos - around, ((maxpos + around) > sentence.length()) ? sentence.length() : (maxpos + around)).trim() + " [..]"; minpos = around; maxpos = sentence.length() - around - 5; diff --git a/source/net/yacy/document/parser/html/ContentScraper.java b/source/net/yacy/document/parser/html/ContentScraper.java index cd895fed0..ab8a244ed 100644 --- a/source/net/yacy/document/parser/html/ContentScraper.java +++ b/source/net/yacy/document/parser/html/ContentScraper.java @@ -354,6 +354,9 @@ public class ContentScraper extends AbstractScraper implements Scraper { return content.getBytes(charSet); } catch (final UnsupportedEncodingException e) { return content.getBytes(); + } catch (final OutOfMemoryError e) { + Log.logException(e); + return new byte[0]; } }