From fbb946f913c9cda7304ea4fbb5c67191a895e67d Mon Sep 17 00:00:00 2001 From: Roland 'Quix0r' Haeder Date: Tue, 15 May 2012 20:57:38 +0200 Subject: [PATCH] Made a method static (Eclipse suggested it), removed unused import, pk=null check does now output a warning in logfile --- htroot/Banner.java | 1 - source/net/yacy/kelondro/table/Table.java | 6 +++++- source/net/yacy/search/index/SolrConfiguration.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htroot/Banner.java b/htroot/Banner.java index 9fad6e8d3..15281c827 100644 --- a/htroot/Banner.java +++ b/htroot/Banner.java @@ -34,7 +34,6 @@ import javax.imageio.ImageIO; import net.yacy.cora.protocol.RequestHeader; import net.yacy.peers.Seed; import net.yacy.peers.graphics.BannerData; -import net.yacy.peers.graphics.NetworkGraph; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; import net.yacy.visualization.RasterPlotter; diff --git a/source/net/yacy/kelondro/table/Table.java b/source/net/yacy/kelondro/table/Table.java index 366f387d4..3e0e94999 100644 --- a/source/net/yacy/kelondro/table/Table.java +++ b/source/net/yacy/kelondro/table/Table.java @@ -690,7 +690,11 @@ public class Table implements Index, Iterable { } this.file.put(i, p, 0); byte[] pk = lr.getPrimaryKeyBytes(); - if (pk == null) continue; + if (pk == null) { + // Table file might be corrupt + Log.logWarning("TABLE", "Possible corruption found in table " + this.filename() + " detected. i=" + i + ",p=" + p); + continue; + } this.index.put(pk, i); break; } diff --git a/source/net/yacy/search/index/SolrConfiguration.java b/source/net/yacy/search/index/SolrConfiguration.java index 563684aaa..8089cf7a0 100644 --- a/source/net/yacy/search/index/SolrConfiguration.java +++ b/source/net/yacy/search/index/SolrConfiguration.java @@ -466,7 +466,7 @@ public class SolrConfiguration extends ConfigurationSet implements Serializable * @param rel * @return binary encoded information about rel */ - private int relEval(final String[] rel) { + private static int relEval(final String[] rel) { int i = 0; for (final String s: rel) { final String s0 = s.toLowerCase().trim();