From d4bce6affdbacb0fa0e15078fbfc1862b168a02d Mon Sep 17 00:00:00 2001 From: danielr Date: Sat, 3 May 2008 09:06:00 +0000 Subject: [PATCH] refactoring (initialized static fields, removed empty if/else, serialized some fields in serializable classes) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4755 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Bookmarks.java | 14 ++--- htroot/CacheAdmin_p.java | 4 +- htroot/IndexCleaner_p.java | 4 +- htroot/LogStatistics_p.java | 7 ++- htroot/News.java | 4 +- htroot/SettingsAck_p.java | 2 +- htroot/Threaddump_p.java | 6 +-- htroot/xml/bookmarks/xbel/xbel.java | 8 +-- htroot/yacy/ui/ymarks.java | 12 ++--- source/de/anomic/data/listManager.java | 4 +- source/de/anomic/data/translator.java | 4 +- source/de/anomic/data/userDB.java | 6 +-- source/de/anomic/data/wiki/knwikiParser.java | 6 +-- .../htmlFilter/htmlFilterContentScraper.java | 6 +-- .../htmlFilterContentTransformer.java | 9 ++-- source/de/anomic/http/HttpClient.java | 13 +++-- .../http/httpdByteCountOutputStream.java | 4 +- source/de/anomic/http/httpdFileHandler.java | 18 +++---- source/de/anomic/http/httpdProxyHandler.java | 17 +++--- source/de/anomic/kelondro/kelondroHandle.java | 2 +- .../kelondro/kelondroMScoreCluster.java | 3 +- .../kelondro/kelondroRowCollection.java | 6 +-- source/de/anomic/net/ftpc.java | 10 ++-- .../plasma/dbImport/plasmaDbImporter.java | 52 +++++++++--------- source/de/anomic/plasma/plasmaCondenser.java | 2 +- .../de/anomic/plasma/plasmaCrawlStacker.java | 1 + source/de/anomic/plasma/plasmaHTCache.java | 6 +-- .../de/anomic/plasma/plasmaSearchEvent.java | 6 +-- .../de/anomic/plasma/plasmaSnippetCache.java | 18 +++---- .../de/anomic/plasma/plasmaSwitchboard.java | 12 ++--- .../server/logging/ConsoleOutHandler.java | 2 +- .../sch/serverPortForwardingSch.java | 6 +-- .../server/serverCachedFileOutputStream.java | 4 +- source/de/anomic/server/serverCore.java | 50 +++++++++-------- source/de/anomic/server/serverCoreSocket.java | 2 +- source/de/anomic/server/serverDate.java | 7 +-- source/de/anomic/server/serverMemory.java | 2 +- source/de/anomic/server/serverProfiling.java | 20 ++++--- source/de/anomic/server/serverSystem.java | 53 ++++++++++--------- source/de/anomic/tools/disorderHeap.java | 7 ++- source/de/anomic/yacy/yacyClient.java | 8 +-- source/de/anomic/yacy/yacyCore.java | 11 ++-- source/de/anomic/yacy/yacyNewsPool.java | 3 +- source/de/anomic/yacy/yacyPeerActions.java | 4 +- source/de/anomic/yacy/yacyURL.java | 12 +++-- source/de/anomic/yacy/yacyVersion.java | 8 ++- source/yacy.java | 2 +- 47 files changed, 230 insertions(+), 237 deletions(-) diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 43fda6230..91e77be04 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -77,10 +77,10 @@ import de.anomic.yacy.yacyURL; public class Bookmarks { - private static serverObjects prop; - private static plasmaSwitchboard switchboard; - private static userDB.Entry user; - private static boolean isAdmin; + private static final serverObjects prop = new serverObjects(); + private static plasmaSwitchboard switchboard = null; + private static userDB.Entry user = null; + private static boolean isAdmin = false; final static int SORT_ALPHA = 1; final static int SORT_SIZE = 2; @@ -95,7 +95,7 @@ public class Bookmarks { String tagName = ""; String username=""; - prop = new serverObjects(); + prop.clear(); switchboard = (plasmaSwitchboard) env; user = switchboard.userDB.getUser(header); isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); @@ -177,8 +177,8 @@ public class Bookmarks { } bookmark.setTags(tags, true); switchboard.bookmarksDB.saveBookmark(bookmark); - }else{ - //ERROR + //}else{ + //ERROR } }else if(post.containsKey("edit")){ String urlHash=(String) post.get("edit"); diff --git a/htroot/CacheAdmin_p.java b/htroot/CacheAdmin_p.java index 76be381cb..ecb565e6c 100644 --- a/htroot/CacheAdmin_p.java +++ b/htroot/CacheAdmin_p.java @@ -220,8 +220,8 @@ public class CacheAdmin_p { prop.put("info_empty", "0"); final TreeSet dList = new TreeSet(); final TreeSet fList = new TreeSet(); - int size = list.length - 1, i = size; - for (; i >= 0 ; i--) { // Rueckwaerts ist schneller + int size = list.length - 1, i; + for (i = size; i >= 0 ; i--) { // Rueckwaerts ist schneller if (new File(dir, list[i]).isDirectory()) dList.add(list[i]); else diff --git a/htroot/IndexCleaner_p.java b/htroot/IndexCleaner_p.java index 7bbe71858..270390700 100755 --- a/htroot/IndexCleaner_p.java +++ b/htroot/IndexCleaner_p.java @@ -51,8 +51,8 @@ import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; public class IndexCleaner_p { - private static indexRepositoryReference.BlacklistCleaner urldbCleanerThread; - private static plasmaWordIndex.ReferenceCleaner indexCleanerThread; + private static indexRepositoryReference.BlacklistCleaner urldbCleanerThread = null; + private static plasmaWordIndex.ReferenceCleaner indexCleanerThread = null; public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { serverObjects prop = new serverObjects(); diff --git a/htroot/LogStatistics_p.java b/htroot/LogStatistics_p.java index 5181fbe81..6239b20b9 100644 --- a/htroot/LogStatistics_p.java +++ b/htroot/LogStatistics_p.java @@ -157,8 +157,8 @@ public class LogStatistics_p { String[] names = ((HashSet) r.get(LogParserPLASMA.DHT_REJECTED_PEERS_NAME)).toArray(new String[1]); String[] hashes = ((HashSet) r.get(LogParserPLASMA.DHT_REJECTED_PEERS_HASH)).toArray(new String[1]); - int i = 0; - for (; i)r.get(LogParserPLASMA.DHT_SENT_PEERS_NAME)).toArray(new String[1]); hashes = ((HashSet)r.get(LogParserPLASMA.DHT_SENT_PEERS_HASH)).toArray(new String[1]); - i = 0; - for (; i recordIterator = yacyCore.newsPool.recordIterator(tableID, false); yacyNewsRecord record; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 887aecec4..c0c23180b 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -77,7 +77,7 @@ import de.anomic.yacy.yacySeedUploader; public class SettingsAck_p { - private static boolean nothingChanged; + private static boolean nothingChanged = false; public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements diff --git a/htroot/Threaddump_p.java b/htroot/Threaddump_p.java index cbc046dc9..cbcf7a838 100644 --- a/htroot/Threaddump_p.java +++ b/htroot/Threaddump_p.java @@ -65,12 +65,12 @@ import java.io.IOException; public class Threaddump_p { - private static serverObjects prop; - private static plasmaSwitchboard sb; + private static final serverObjects prop = new serverObjects(); + private static plasmaSwitchboard sb = null; public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - prop = new serverObjects(); + prop.clear(); sb = (plasmaSwitchboard) env; StringBuffer buffer = new StringBuffer(1000); diff --git a/htroot/xml/bookmarks/xbel/xbel.java b/htroot/xml/bookmarks/xbel/xbel.java index 4b692b209..002370d4c 100644 --- a/htroot/xml/bookmarks/xbel/xbel.java +++ b/htroot/xml/bookmarks/xbel/xbel.java @@ -10,15 +10,15 @@ import de.anomic.server.serverSwitch; public class xbel { - private static serverObjects prop; - private static plasmaSwitchboard switchboard; - private static boolean isAdmin; + private static final serverObjects prop = new serverObjects(); + private static plasmaSwitchboard switchboard = null; + private static boolean isAdmin = false; public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { int count = 0;; - prop = new serverObjects(); + prop.clear(); switchboard = (plasmaSwitchboard) env; isAdmin=switchboard.verifyAuthentication(header, true); diff --git a/htroot/yacy/ui/ymarks.java b/htroot/yacy/ui/ymarks.java index 67d899572..6f56afc1c 100644 --- a/htroot/yacy/ui/ymarks.java +++ b/htroot/yacy/ui/ymarks.java @@ -77,10 +77,10 @@ import de.anomic.yacy.yacyURL; public class ymarks { - private static serverObjects prop; - private static plasmaSwitchboard switchboard; - private static userDB.Entry user; - private static boolean isAdmin; + private static final serverObjects prop = new serverObjects(); + private static plasmaSwitchboard switchboard = null; + private static userDB.Entry user = null; + private static boolean isAdmin = false; final static int SORT_ALPHA = 1; final static int SORT_SIZE = 2; @@ -95,7 +95,7 @@ public class ymarks { String tagName = ""; String username=""; - prop = new serverObjects(); + prop.clear(); switchboard = (plasmaSwitchboard) env; user = switchboard.userDB.getUser(header); isAdmin=(switchboard.verifyAuthentication(header, true) || user!= null && user.hasRight(userDB.Entry.BOOKMARK_RIGHT)); @@ -177,7 +177,7 @@ public class ymarks { } bookmark.setTags(tags, true); switchboard.bookmarksDB.saveBookmark(bookmark); - }else{ + //}else{ //ERROR } }else if(post.containsKey("edit")){ diff --git a/source/de/anomic/data/listManager.java b/source/de/anomic/data/listManager.java index 4da155ac4..50633f02c 100644 --- a/source/de/anomic/data/listManager.java +++ b/source/de/anomic/data/listManager.java @@ -67,8 +67,8 @@ import de.anomic.server.serverCore; // The Naming of the functions is a bit strange... public class listManager { - public static plasmaSwitchboard switchboard; - public static File listsPath; + public static plasmaSwitchboard switchboard = null; + public static File listsPath = null; /** * Get ListSet from configuration file and return it as a unified Set. diff --git a/source/de/anomic/data/translator.java b/source/de/anomic/data/translator.java index 4f29a0fa1..00f1fe675 100644 --- a/source/de/anomic/data/translator.java +++ b/source/de/anomic/data/translator.java @@ -116,7 +116,7 @@ public class translator { splitted = line.split("==", 2); if(splitted.length == 2){ translationList.put(splitted[0], splitted[1]); - }else{ //Invalid line + //}else{ //Invalid line } }else if(line.startsWith("#File: ")){ if(!forFile.equals("")){ @@ -212,7 +212,7 @@ public class translator { , translationLists.get(relativePath))){ serverLog.logSevere("TRANSLATOR", "File error while translating file "+relativePath); } - }else{ + //}else{ //serverLog.logInfo("TRANSLATOR", "No translation for file: "+relativePath); } } diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java index b3e88bf09..1b0c21d50 100644 --- a/source/de/anomic/data/userDB.java +++ b/source/de/anomic/data/userDB.java @@ -140,14 +140,14 @@ public final class userDB { String[] tmp=auth.split(":"); if(tmp.length == 2){ entry=this.passwordAuth(tmp[0], tmp[1]); - if(entry != null){ +// if(entry != null){ //return entry; - }else{ //wrong/no auth, so auth is removed from browser +// }else{ //wrong/no auth, so auth is removed from browser /*FIXME: This cannot work try{ entry.setProperty(Entry.LOGGED_OUT, "false"); }catch(IOException e){}*/ - } +// } return entry; } return null; diff --git a/source/de/anomic/data/wiki/knwikiParser.java b/source/de/anomic/data/wiki/knwikiParser.java index 79fdb1cd0..ad89f6c6e 100644 --- a/source/de/anomic/data/wiki/knwikiParser.java +++ b/source/de/anomic/data/wiki/knwikiParser.java @@ -191,11 +191,11 @@ public class knwikiParser implements wikiParser { while (m.find()) try { //System.out.print("found " + st.getClass().getSimpleName() + ": " + // m.group().replaceAll("\n", "\\\\n").replaceAll("\t", " ") + ", "); - if (st.setText(m.group(), j)) { - // System.out.println("usable"); - } else { + if (!st.setText(m.group(), j)) { // System.out.println("not usable"); continue; + //} else { + // System.out.println("usable"); } m.appendReplacement(sb, (st.getMarkup() == null) ? m.group() : st.getMarkup()); } catch (wikiParserException e) { diff --git a/source/de/anomic/htmlFilter/htmlFilterContentScraper.java b/source/de/anomic/htmlFilter/htmlFilterContentScraper.java index 3e48b5f3e..b601783c6 100644 --- a/source/de/anomic/htmlFilter/htmlFilterContentScraper.java +++ b/source/de/anomic/htmlFilter/htmlFilterContentScraper.java @@ -69,11 +69,10 @@ import de.anomic.yacy.yacyURL; public class htmlFilterContentScraper extends htmlFilterAbstractScraper implements htmlFilterScraper { // statics: for initialization of the HTMLFilterAbstractScraper - private static HashSet linkTags0; - private static HashSet linkTags1; + private static final HashSet linkTags0 = new HashSet(9,0.99f); + private static final HashSet linkTags1 = new HashSet(7,0.99f); static { - linkTags0 = new HashSet(); linkTags0.add("img"); linkTags0.add("base"); linkTags0.add("frame"); @@ -83,7 +82,6 @@ public class htmlFilterContentScraper extends htmlFilterAbstractScraper implemen linkTags0.add("embed"); //added by [MN] linkTags0.add("param"); //added by [MN] - linkTags1 = new HashSet(); linkTags1.add("a"); linkTags1.add("h1"); linkTags1.add("h2"); diff --git a/source/de/anomic/htmlFilter/htmlFilterContentTransformer.java b/source/de/anomic/htmlFilter/htmlFilterContentTransformer.java index df44a3cf1..7a5e20c4a 100644 --- a/source/de/anomic/htmlFilter/htmlFilterContentTransformer.java +++ b/source/de/anomic/htmlFilter/htmlFilterContentTransformer.java @@ -59,21 +59,19 @@ import de.anomic.server.serverCharBuffer; public class htmlFilterContentTransformer extends htmlFilterAbstractTransformer implements htmlFilterTransformer { // statics: for initialisation of the HTMLFilterAbstractTransformer - private static TreeSet linkTags0; - private static TreeSet linkTags1; - private static final Collator insensitiveCollator = Collator.getInstance(Locale.US); + private static final TreeSet linkTags0 = new TreeSet(insensitiveCollator);; + private static final TreeSet linkTags1 = new TreeSet(insensitiveCollator);; + static { insensitiveCollator.setStrength(Collator.SECONDARY); insensitiveCollator.setDecomposition(Collator.NO_DECOMPOSITION); } static { - linkTags0 = new TreeSet(insensitiveCollator); linkTags0.add("img"); linkTags0.add("input"); - linkTags1 = new TreeSet(insensitiveCollator); linkTags1.add("a"); } @@ -134,6 +132,7 @@ public class htmlFilterContentTransformer extends htmlFilterAbstractTransformer serverByteBuffer[] sbbs = httpTemplate.splitQuotations(sbb); //sbb = new serverByteBuffer(); for (int i = 0; i < sbbs.length; i++) { + // TODO: avoid empty if statements if (sbbs[i].isWhitespace(true)) { //sbb.append(sbbs[i]); } else if ((sbbs[i].byteAt(0) == httpTemplate.hash) || diff --git a/source/de/anomic/http/HttpClient.java b/source/de/anomic/http/HttpClient.java index 4eb63b105..778fa1e07 100644 --- a/source/de/anomic/http/HttpClient.java +++ b/source/de/anomic/http/HttpClient.java @@ -38,14 +38,13 @@ import de.anomic.server.logging.serverLog; */ public abstract class HttpClient { - private static final String systemOST; - static { - // provide system information for client identification - final String loc = generateLocation(); - systemOST = System.getProperty("os.arch", "no-os-arch") + " " + System.getProperty("os.name", "no-os-name") + + /** + * provide system information for client identification + */ + private static final String systemOST = + System.getProperty("os.arch", "no-os-arch") + " " + System.getProperty("os.name", "no-os-name") + " " + System.getProperty("os.version", "no-os-version") + "; " + "java " + - System.getProperty("java.version", "no-java-version") + "; " + loc; - } + System.getProperty("java.version", "no-java-version") + "; " + generateLocation(); /** * generating the location string diff --git a/source/de/anomic/http/httpdByteCountOutputStream.java b/source/de/anomic/http/httpdByteCountOutputStream.java index a3f890f99..6d502d492 100644 --- a/source/de/anomic/http/httpdByteCountOutputStream.java +++ b/source/de/anomic/http/httpdByteCountOutputStream.java @@ -89,13 +89,13 @@ public class httpdByteCountOutputStream extends BufferedOutputStream { } /** @see java.io.OutputStream#write(byte[], int, int) */ - public void write(byte[] b, int off, int len) throws IOException { + public synchronized void write(byte[] b, int off, int len) throws IOException { super.write(b, off, len); this.byteCount += len; } /** @see java.io.OutputStream#write(int) */ - public void write(int b) throws IOException { + public synchronized void write(int b) throws IOException { super.write(b); this.byteCount++; } diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 9ce8d6fb0..96ebf75b9 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -117,8 +117,9 @@ public final class httpdFileHandler { private static final boolean safeServletsMode = false; // if true then all servlets are called synchronized private static final Properties mimeTable = new Properties(); - private static final serverClassLoader provider; - private static serverSwitch switchboard; + // create a class loader + private static final serverClassLoader provider = new serverClassLoader(/*this.getClass().getClassLoader()*/); + private static serverSwitch switchboard = null; private static plasmaSwitchboard sb = plasmaSwitchboard.getSwitchboard(); private static File htRootPath = null; @@ -134,20 +135,15 @@ public final class httpdFileHandler { public static boolean useTemplateCache = false; //private Properties connectionProperties = null; - private static serverLog theLogger; + // creating a logger + private static final serverLog theLogger = new serverLog("FILEHANDLER"); static { - serverSwitch switchboard = plasmaSwitchboard.getSwitchboard(); + final serverSwitch switchboard = plasmaSwitchboard.getSwitchboard(); useTemplateCache = switchboard.getConfig("enableTemplateCache","true").equalsIgnoreCase("true"); templateCache = (useTemplateCache)? new HashMap>() : new HashMap>(0); templateMethodCache = (useTemplateCache) ? new HashMap>() : new HashMap>(0); - // create a class loader - provider = new serverClassLoader(/*this.getClass().getClassLoader()*/); - - // creating a logger - theLogger = new serverLog("FILEHANDLER"); - if (httpdFileHandler.switchboard == null) { httpdFileHandler.switchboard = switchboard; @@ -217,7 +213,7 @@ public final class httpdFileHandler { if (htLocalePath == null) htLocalePath = switchboard.getConfigPath("locale.translated_html","DATA/LOCALE/htroot"); if (!(localeSelection.equals("default"))) { - File localePath = new File(htLocalePath, localeSelection + "/" + path); + File localePath = new File(htLocalePath, localeSelection + '/' + path); if (localePath.exists()) // avoid "NoSuchFile" troubles if the "localeSelection" is misspelled return localePath; } diff --git a/source/de/anomic/http/httpdProxyHandler.java b/source/de/anomic/http/httpdProxyHandler.java index 8d9bf122e..59eb4f470 100644 --- a/source/de/anomic/http/httpdProxyHandler.java +++ b/source/de/anomic/http/httpdProxyHandler.java @@ -123,10 +123,10 @@ public final class httpdProxyHandler { private static int timeout = 30000; private static boolean yacyTrigger = true; public static boolean isTransparentProxy = false; - private static Process redirectorProcess; - private static boolean redirectorEnabled=false; - private static PrintWriter redirectorWriter; - private static BufferedReader redirectorReader; + private static Process redirectorProcess = null; + private static boolean redirectorEnabled = false; + private static PrintWriter redirectorWriter = null; + private static BufferedReader redirectorReader = null; private static htmlFilterTransformer transformer = null; /** @@ -137,7 +137,8 @@ public final class httpdProxyHandler { private static File htRootPath = null; //private Properties connectionProperties = null; - private static serverLog theLogger; + // creating a logger + private static final serverLog theLogger = new serverLog("PROXY"); private static boolean doAccessLogging = false; /** @@ -191,8 +192,6 @@ public final class httpdProxyHandler { switchboard = plasmaSwitchboard.getSwitchboard(); if (switchboard != null) { - // creating a logger - theLogger = new serverLog("PROXY"); isTransparentProxy = Boolean.valueOf(switchboard.getConfig("isTransparentProxy","false")).booleanValue(); @@ -696,7 +695,7 @@ public final class httpdProxyHandler { writeContent(res, new BufferedWriter(hfos)); if (hfos instanceof htmlFilterWriter) ((htmlFilterWriter) hfos).finalize(); - if (sizeBeforeDelete == -1) { + /*if (sizeBeforeDelete == -1) { // no old file and no load. just data passing //cacheEntry.status = plasmaHTCache.CACHE_PASSING; //cacheManager.push(cacheEntry); @@ -704,7 +703,7 @@ public final class httpdProxyHandler { // before we came here we deleted a cache entry //cacheEntry.status = plasmaHTCache.CACHE_STALE_NO_RELOAD; //cacheManager.push(cacheEntry); - } + }*/ conProp.setProperty(httpHeader.CONNECTION_PROP_PROXY_RESPOND_CODE,"TCP_MISS"); } diff --git a/source/de/anomic/kelondro/kelondroHandle.java b/source/de/anomic/kelondro/kelondroHandle.java index 7de5bae7c..312831626 100644 --- a/source/de/anomic/kelondro/kelondroHandle.java +++ b/source/de/anomic/kelondro/kelondroHandle.java @@ -59,7 +59,7 @@ public class kelondroHandle implements Comparable { public boolean equals(Object h) { assert (index != NUL); assert (((kelondroHandle) h).index != NUL); - return (this.index == ((kelondroHandle) h).index); + return (h instanceof kelondroHandle && this.index == ((kelondroHandle) h).index); } public int compare(kelondroHandle h0, kelondroHandle h1) { diff --git a/source/de/anomic/kelondro/kelondroMScoreCluster.java b/source/de/anomic/kelondro/kelondroMScoreCluster.java index 520e9f690..4ed56af98 100644 --- a/source/de/anomic/kelondro/kelondroMScoreCluster.java +++ b/source/de/anomic/kelondro/kelondroMScoreCluster.java @@ -125,9 +125,8 @@ public final class kelondroMScoreCluster { } } - private static byte[] plainByteArray; + private static final byte[] plainByteArray = new byte[256]; static { - plainByteArray = new byte[256]; for (int i = 0; i < 32; i++) plainByteArray[i] = (byte) i; for (int i = 32; i < 96; i++) plainByteArray[i] = (byte) (i - 32); for (int i = 96; i < 128; i++) plainByteArray[i] = (byte) (i - 64); diff --git a/source/de/anomic/kelondro/kelondroRowCollection.java b/source/de/anomic/kelondro/kelondroRowCollection.java index 20201aa5e..94523cfce 100644 --- a/source/de/anomic/kelondro/kelondroRowCollection.java +++ b/source/de/anomic/kelondro/kelondroRowCollection.java @@ -874,7 +874,7 @@ public class kelondroRowCollection { if (b == 0) return a; else return a / b; } - private static Random random; + private static Random random = null; private static String randomHash() { return kelondroBase64Order.enhancedCoder.encodeLong(random.nextLong(), 4) + @@ -940,9 +940,9 @@ public class kelondroRowCollection { System.out.println("uniq d : " + (t6 - t5) + " nanoseconds, " + d(testsize, (t6 - t5)) + " entries/nanoseconds"); random = new Random(0); kelondroRowSet e = new kelondroRowSet(r, testsize); - for (int i = 0; i < testsize; i++) { + /*for (int i = 0; i < testsize; i++) { //e.put(r.newEntry(randomHash().getBytes())); - } + }*/ long t7 = System.nanoTime(); System.out.println("create e : " + (t7 - t6) + " nanoseconds, " + d(testsize, (t7 - t6)) + " entries/nanoseconds"); e.sort(); diff --git a/source/de/anomic/net/ftpc.java b/source/de/anomic/net/ftpc.java index 2abf7f210..02021e7ef 100644 --- a/source/de/anomic/net/ftpc.java +++ b/source/de/anomic/net/ftpc.java @@ -235,8 +235,8 @@ public class ftpc { ret = (((Boolean) getClass().getMethod(cmd[0].toUpperCase(), new Class[0]).invoke(this, new Object[0])) .booleanValue()); } catch (final InvocationTargetException e) { - if (e.getMessage() == null) { - } else if (notConnected()) { + if (e.getMessage() != null) { + if (notConnected()) { // the error was probably caused because there is no // connection errPrintln("not connected. no effect."); @@ -246,6 +246,7 @@ public class ftpc { errPrintln("ftp internal exception: target exception " + e); return ret; } + } } catch (final IllegalAccessException e) { errPrintln("ftp internal exception: wrong access " + e); return ret; @@ -304,7 +305,7 @@ public class ftpc { super(); } - public Class loadClass(final String classname, final boolean resolve) throws ClassNotFoundException { + public synchronized Class loadClass(final String classname, final boolean resolve) throws ClassNotFoundException { Class c = findLoadedClass(classname); if (c == null) { try { @@ -394,8 +395,7 @@ public class ftpc { errPrintln("no \"public static main(String args[])\" in " + obj); } catch (final InvocationTargetException e) { final Throwable orig = e.getTargetException(); - if (orig.getMessage() == null) { - } else { + if (orig.getMessage() != null) { errPrintln("Exception from " + obj + ": " + orig.getMessage()); orig.printStackTrace(err); } diff --git a/source/de/anomic/plasma/dbImport/plasmaDbImporter.java b/source/de/anomic/plasma/dbImport/plasmaDbImporter.java index a70b265d6..d9f17356e 100644 --- a/source/de/anomic/plasma/dbImport/plasmaDbImporter.java +++ b/source/de/anomic/plasma/dbImport/plasmaDbImporter.java @@ -173,36 +173,38 @@ public class plasmaDbImporter extends AbstractImporter implements dbImporter { if (isAborted()) break; String urlHash = urlIter.next(); - if (importedUrlBuffer.contains(urlHash)) { - // already known url - } else if (unknownUrlBuffer.contains(urlHash)) { - // url known as unknown - unknownUrlBuffer.add(urlHash); - notBoundEntryCounter++; - newContainer.remove(urlHash); - continue; - } else { - // we need to import the url - - // getting the url entry - indexURLReference urlEntry = this.importWordIndex.getURL(urlHash, null, 0); - if (urlEntry != null) { - - /* write it into the home url db */ - homeWordIndex.putURL(urlEntry); - importedUrlBuffer.add(urlHash); - this.urlCounter++; - - if (this.urlCounter % 500 == 0) { - this.log.logFine(this.urlCounter + " URLs processed so far."); - } - - } else { + if (!importedUrlBuffer.contains(urlHash)) { + if (unknownUrlBuffer.contains(urlHash)) { + // url known as unknown unknownUrlBuffer.add(urlHash); notBoundEntryCounter++; newContainer.remove(urlHash); continue; + } else { + // we need to import the url + + // getting the url entry + indexURLReference urlEntry = this.importWordIndex.getURL(urlHash, null, 0); + if (urlEntry != null) { + + /* write it into the home url db */ + homeWordIndex.putURL(urlEntry); + importedUrlBuffer.add(urlHash); + this.urlCounter++; + + if (this.urlCounter % 500 == 0) { + this.log.logFine(this.urlCounter + " URLs processed so far."); + } + + } else { + unknownUrlBuffer.add(urlHash); + notBoundEntryCounter++; + newContainer.remove(urlHash); + continue; + } } + //} else { + // already known url } this.entryCounter++; } diff --git a/source/de/anomic/plasma/plasmaCondenser.java b/source/de/anomic/plasma/plasmaCondenser.java index b1c71981b..938228276 100644 --- a/source/de/anomic/plasma/plasmaCondenser.java +++ b/source/de/anomic/plasma/plasmaCondenser.java @@ -693,7 +693,7 @@ public final class plasmaCondenser { char c, lc = ' '; // starting with ' ' as last character prevents that the result string starts with a ' ' // find sentence end - for (;;) { + while (true) { nextChar = reader.read(); //System.out.print((char) nextChar); // DEBUG if (nextChar < 0) { diff --git a/source/de/anomic/plasma/plasmaCrawlStacker.java b/source/de/anomic/plasma/plasmaCrawlStacker.java index a5ef75fef..68ddafa6a 100644 --- a/source/de/anomic/plasma/plasmaCrawlStacker.java +++ b/source/de/anomic/plasma/plasmaCrawlStacker.java @@ -279,6 +279,7 @@ public final class plasmaCrawlStacker extends Thread { private void deleteDB() { if (this.dbtype == QUEUE_DB_TYPE_RAM) { // do nothing.. + return; } if (this.dbtype == QUEUE_DB_TYPE_ECO) { new File(cacheStacksPath, stackfile).delete(); diff --git a/source/de/anomic/plasma/plasmaHTCache.java b/source/de/anomic/plasma/plasmaHTCache.java index b248fdf1a..eb6a6a0de 100644 --- a/source/de/anomic/plasma/plasmaHTCache.java +++ b/source/de/anomic/plasma/plasmaHTCache.java @@ -101,13 +101,13 @@ public final class plasmaHTCache { private static final ConcurrentLinkedQueue cacheStack = new ConcurrentLinkedQueue(); private static final ConcurrentHashMap cacheAge = new ConcurrentHashMap(); // a - relation public static long curCacheSize = 0; - public static long maxCacheSize; - public static File cachePath; + public static long maxCacheSize = 0l; + public static File cachePath = null; public static final serverLog log = new serverLog("HTCACHE"); private static long lastcleanup = System.currentTimeMillis(); private static ResourceInfoFactory objFactory = new ResourceInfoFactory(); - private static serverThread cacheScanThread; + private static serverThread cacheScanThread = null; // doctypes: public static final char DT_PDFPS = 'p'; diff --git a/source/de/anomic/plasma/plasmaSearchEvent.java b/source/de/anomic/plasma/plasmaSearchEvent.java index 7e877626c..1436b1c4b 100644 --- a/source/de/anomic/plasma/plasmaSearchEvent.java +++ b/source/de/anomic/plasma/plasmaSearchEvent.java @@ -670,9 +670,7 @@ public final class plasmaSearchEvent { } */ TreeMap abstractJoin = (rcAbstracts.size() == query.queryHashes.size()) ? kelondroMSetTools.joinConstructive(rcAbstracts.values(), true) : new TreeMap(); - if (abstractJoin.size() == 0) { - //System.out.println("DEBUG-INDEXABSTRACT: no success using index abstracts from remote peers"); - } else { + if (abstractJoin.size() != 0) { //System.out.println("DEBUG-INDEXABSTRACT: index abstracts delivered " + abstractJoin.size() + " additional results for secondary search"); // generate query for secondary search TreeMap secondarySearchURLs = new TreeMap(); // a (peerhash:urlhash-liststring) mapping @@ -717,6 +715,8 @@ public final class plasmaSearchEvent { query.ranking, query.constraint, preselectedPeerHashes); } + //} else { + //System.out.println("DEBUG-INDEXABSTRACT: no success using index abstracts from remote peers"); } } diff --git a/source/de/anomic/plasma/plasmaSnippetCache.java b/source/de/anomic/plasma/plasmaSnippetCache.java index 57e28584b..fba3b2d4d 100644 --- a/source/de/anomic/plasma/plasmaSnippetCache.java +++ b/source/de/anomic/plasma/plasmaSnippetCache.java @@ -86,9 +86,9 @@ public class plasmaSnippetCache { public static final int ERROR_PARSER_NO_LINES = 15; public static final int ERROR_NO_MATCH = 16; - private static int snippetsScoreCounter; - private static kelondroMScoreCluster snippetsScore; - private static HashMap snippetsCache; + private static int snippetsScoreCounter = 0; + private static kelondroMScoreCluster snippetsScore = null; + private static final HashMap snippetsCache = new HashMap(); /** * a cache holding URLs to favicons specified by the page content, e.g. by using the html link-tag. e.g. @@ -96,9 +96,9 @@ public class plasmaSnippetCache { * <link rel="shortcut icon" type="image/x-icon" href="../src/favicon.ico"> * */ - private static HashMap faviconCache; - private static plasmaParser parser; - private static serverLog log; + private static final HashMap faviconCache = new HashMap(); + private static plasmaParser parser = null; + private static serverLog log = null; public static void init( plasmaParser parserx, @@ -108,8 +108,8 @@ public class plasmaSnippetCache { log = logx; snippetsScoreCounter = 0; snippetsScore = new kelondroMScoreCluster(); - snippetsCache = new HashMap(); - faviconCache = new HashMap(); + snippetsCache.clear(); + faviconCache.clear(); } public static class TextSnippet { @@ -477,7 +477,7 @@ public class plasmaSnippetCache { if (snippetsScoreCounter == java.lang.Integer.MAX_VALUE) { snippetsScoreCounter = 0; snippetsScore = new kelondroMScoreCluster(); - snippetsCache = new HashMap(); + snippetsCache.clear(); } // flush cache if cache is full diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 698106c4c..f581ff06f 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -184,7 +184,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch badwords = null; public static TreeSet blueList = null; public static TreeSet stopwords = null; - public static indexReferenceBlacklist urlBlacklist; + public static indexReferenceBlacklist urlBlacklist = null; public static wikiParser wikiParser = null; @@ -207,7 +207,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch crawlJobsStatus = new Hashtable(); - private static plasmaSwitchboard sb; + private static plasmaSwitchboard sb = null; public plasmaSwitchboard(File rootPath, String initPath, String configPath, boolean applyPro) { super(rootPath, initPath, configPath, applyPro); @@ -1627,9 +1627,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch 4) && (tmp.toUpperCase().startsWith("PASS"))) { - log(true, "PASS ********"); - } else { - log(true, tmp); + if (result != null) { + if (result instanceof Boolean) { + if (((Boolean) result).equals(TERMINATE_CONNECTION)) break; + + /* + * setting timeout to a very high level. + * this is needed because of persistent connection + * support. + */ + if (!this.controlSocket.isClosed()) this.controlSocket.setSoTimeout(30*60*1000); + } else if (result instanceof String) { + if (((String) result).startsWith("!")) { + result = ((String) result).substring(1); + terminate = true; + } + writeLine((String) result); + } else if (result instanceof InputStream) { + String tmp = send(this.out, (InputStream) result); + if ((tmp.length() > 4) && (tmp.toUpperCase().startsWith("PASS"))) { + log(true, "PASS ********"); + } else { + log(true, tmp); + } + tmp = null; } - tmp = null; } if (terminate) break; diff --git a/source/de/anomic/server/serverCoreSocket.java b/source/de/anomic/server/serverCoreSocket.java index 33c9dabdb..bcb2f7666 100644 --- a/source/de/anomic/server/serverCoreSocket.java +++ b/source/de/anomic/server/serverCoreSocket.java @@ -117,7 +117,7 @@ public class serverCoreSocket extends Socket { break; } this.isSSL = true; - } else { + //} else { // maybe SSL_2, but we can not be sure } diff --git a/source/de/anomic/server/serverDate.java b/source/de/anomic/server/serverDate.java index cb4764e78..a753660fb 100644 --- a/source/de/anomic/server/serverDate.java +++ b/source/de/anomic/server/serverDate.java @@ -441,23 +441,20 @@ public final class serverDate { private static Calendar thisCalendar = Calendar.getInstance(); // pre-calculation of time tables - private final static long[] dimnormalacc, dimleapacc; - private static long[] utimeyearsacc; + private final static long[] dimnormalacc = new long[12], dimleapacc = new long[12]; + private final static long[] utimeyearsacc = new long[67]; static { long millis = 0; - utimeyearsacc = new long[67]; for (int i = 0; i < 67; i++) { utimeyearsacc[i] = millis; millis += ((i & 3) == 0) ? leapyearMillis : normalyearMillis; } millis = 0; - dimnormalacc = new long[12]; for (int i = 0; i < 12; i++) { dimnormalacc[i] = millis; millis += (dayMillis * dimnormal[i]); } millis = 0; - dimleapacc = new long[12]; for (int i = 0; i < 12; i++) { dimleapacc[i] = millis; millis += (dayMillis * dimleap[i]); diff --git a/source/de/anomic/server/serverMemory.java b/source/de/anomic/server/serverMemory.java index d9e84b717..06c45adaf 100644 --- a/source/de/anomic/server/serverMemory.java +++ b/source/de/anomic/server/serverMemory.java @@ -39,7 +39,7 @@ public class serverMemory { private static final long[] gcs = new long[5]; private static int gcs_pos = 0; - private static long lastGC; + private static long lastGC = 0l; /** * Runs the garbage collector if last garbage collection is more than last millis ago diff --git a/source/de/anomic/server/serverProfiling.java b/source/de/anomic/server/serverProfiling.java index d0e2dc292..490a7a77b 100644 --- a/source/de/anomic/server/serverProfiling.java +++ b/source/de/anomic/server/serverProfiling.java @@ -33,17 +33,15 @@ import java.util.concurrent.ConcurrentLinkedQueue; public class serverProfiling extends Thread { - private static Map> historyMaps; // key=name of history, value=TreeMap of Long/Event - private static Map eventCounter; // key=name of history, value=Integer of event counter - private static serverProfiling systemProfiler; - - static { - // initialize profiling - historyMaps = new ConcurrentHashMap>(); - eventCounter = new ConcurrentHashMap(); - //lastCompleteCleanup = System.currentTimeMillis(); - systemProfiler = null; - } + /** + * key=name of history, value=TreeMap of Long/Event + */ + private static final Map> historyMaps = new ConcurrentHashMap>();; + /** + * key=name of history, value=Integer of event counter + */ + private static final Map eventCounter = new ConcurrentHashMap(); + private static serverProfiling systemProfiler = null; public static void startSystemProfiling() { systemProfiler = new serverProfiling(1000); diff --git a/source/de/anomic/server/serverSystem.java b/source/de/anomic/server/serverSystem.java index 1edac6106..02658a33d 100644 --- a/source/de/anomic/server/serverSystem.java +++ b/source/de/anomic/server/serverSystem.java @@ -295,32 +295,33 @@ public final class serverSystem { try { String cmd; Process p; - if (systemOS == systemUnknown) { - } else if (systemOS == systemMacOSC) { - if ((isMacArchitecture) && (macMRJFileUtils != null)) { - macOpenURL.invoke(null, new Object[] {url}); - } - } else if (systemOS == systemMacOSX) { - p = Runtime.getRuntime().exec(new String[] {"/usr/bin/osascript", "-e", "open location \"" + url + "\""}); - p.waitFor(); - if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); - } else if (systemOS == systemUnix) { - cmd = app + " -remote openURL(" + url + ") &"; - p = Runtime.getRuntime().exec(cmd); - p.waitFor(); - if (p.exitValue() != 0) { - cmd = app + " " + url + " &"; - p = Runtime.getRuntime().exec(cmd); - p.waitFor(); - } - if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); - } else if (systemOS == systemWindows) { - // see forum at http://forum.java.sun.com/thread.jsp?forum=57&thread=233364&message=838441 - cmd = "rundll32 url.dll,FileProtocolHandler " + url; - //cmd = "cmd.exe /c start javascript:document.location='" + url + "'"; - p = Runtime.getRuntime().exec(cmd); - p.waitFor(); - if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); + if (systemOS != systemUnknown) { + if (systemOS == systemMacOSC) { + if ((isMacArchitecture) && (macMRJFileUtils != null)) { + macOpenURL.invoke(null, new Object[] {url}); + } + } else if (systemOS == systemMacOSX) { + p = Runtime.getRuntime().exec(new String[] {"/usr/bin/osascript", "-e", "open location \"" + url + "\""}); + p.waitFor(); + if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); + } else if (systemOS == systemUnix) { + cmd = app + " -remote openURL(" + url + ") &"; + p = Runtime.getRuntime().exec(cmd); + p.waitFor(); + if (p.exitValue() != 0) { + cmd = app + " " + url + " &"; + p = Runtime.getRuntime().exec(cmd); + p.waitFor(); + } + if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); + } else if (systemOS == systemWindows) { + // see forum at http://forum.java.sun.com/thread.jsp?forum=57&thread=233364&message=838441 + cmd = "rundll32 url.dll,FileProtocolHandler " + url; + //cmd = "cmd.exe /c start javascript:document.location='" + url + "'"; + p = Runtime.getRuntime().exec(cmd); + p.waitFor(); + if (p.exitValue() != 0) throw new RuntimeException("EXEC ERROR: " + errorResponse(p)); + } } } catch (Exception e) { System.out.println("please start your browser and open the following location: " + url); diff --git a/source/de/anomic/tools/disorderHeap.java b/source/de/anomic/tools/disorderHeap.java index 82c03a3c3..348a1fa72 100644 --- a/source/de/anomic/tools/disorderHeap.java +++ b/source/de/anomic/tools/disorderHeap.java @@ -41,9 +41,14 @@ package de.anomic.tools; +import java.io.Serializable; import java.util.LinkedList; -public class disorderHeap { +public class disorderHeap implements Serializable { + /** + * generated with svn4743 on 2008-04-28 + */ + private static final long serialVersionUID = -1576632540870640019L; LinkedList list; diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 417ac4c6f..355869aa6 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -937,9 +937,9 @@ public final class yacyClient { final List post = yacyNetwork.basicRequestPost(plasmaSwitchboard.getSwitchboard(), targetSeed.hash, salt); // enabling gzip compression for post request body - if ((gzipBody) && (targetSeed.getVersion() >= yacyVersion.YACY_SUPPORTS_GZIP_POST_REQUESTS)) { + /*if ((gzipBody) && (targetSeed.getVersion() >= yacyVersion.YACY_SUPPORTS_GZIP_POST_REQUESTS)) { // TODO generate gzip-Header (and stream?) - } + }*/ post.add(new StringPart("wordc", Integer.toString(indexes.length))); int indexcount = 0; @@ -995,9 +995,9 @@ public final class yacyClient { final List post = yacyNetwork.basicRequestPost(plasmaSwitchboard.getSwitchboard(), targetSeed.hash, salt); // enabling gzip compression for post request body - if ((gzipBody) && (targetSeed.getVersion() >= yacyVersion.YACY_SUPPORTS_GZIP_POST_REQUESTS)) { + /*if ((gzipBody) && (targetSeed.getVersion() >= yacyVersion.YACY_SUPPORTS_GZIP_POST_REQUESTS)) { // TODO generate gzip-Header (and stream?) - } + }*/ String resource = ""; int urlc = 0; diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java index 58cf36bdd..7d8ab1905 100644 --- a/source/de/anomic/yacy/yacyCore.java +++ b/source/de/anomic/yacy/yacyCore.java @@ -88,11 +88,11 @@ public class yacyCore { public static final HashMap seedUploadMethods = new HashMap(); public static yacyPeerActions peerActions = null; public static yacyDHTAction dhtAgent = null; - public static serverLog log; + public static final serverLog log = new serverLog("YACY"); public static long lastOnlineTime = 0; /** pseudo-random key derived from a time-interval while YaCy startup*/ public static long speedKey = 0; - public static File yacyDBPath; + public static File yacyDBPath = null; public static final Map amIAccessibleDB = Collections.synchronizedMap(new HashMap()); // Holds PeerHash / yacyAccessible Relations // constants for PeerPing behaviour private static final int PING_INITIAL = 10; @@ -131,9 +131,6 @@ public class yacyCore { peernews.setMaxsize(1000); peernews.addMessage(new RSSMessage("YaCy started", "")); - // set log level - log = new serverLog("YACY"); - // create a yacy db yacyDBPath = sb.getConfigPath("yacyDB", "DATA/YACYDB"); if (!yacyDBPath.exists()) { yacyDBPath.mkdir(); } @@ -590,9 +587,9 @@ public class yacyCore { for (int currentThreadIdx = 0; currentThreadIdx < threadCount; currentThreadIdx++) { Thread currentThread = threadList[currentThreadIdx]; - if (currentThread.isAlive()) { + /*if (currentThread.isAlive()) { // TODO: this object should care of all open clien connections within this class and close them here - } + }*/ } // we need to use a timeout here because of missing interruptable session threads ... diff --git a/source/de/anomic/yacy/yacyNewsPool.java b/source/de/anomic/yacy/yacyNewsPool.java index 7ab3d9a4f..d06514983 100644 --- a/source/de/anomic/yacy/yacyNewsPool.java +++ b/source/de/anomic/yacy/yacyNewsPool.java @@ -254,9 +254,8 @@ public class yacyNewsPool { CATEGORY_BLOG_ADD, CATEGORY_BLOG_DEL }; - public static HashSet categories; + public static final HashSet categories = new HashSet(); static { - categories = new HashSet(); for (int i = 0; i < category.length; i++) categories.add(category[i]); } diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java index 93b3cd05d..c54a6f59b 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/de/anomic/yacy/yacyPeerActions.java @@ -322,9 +322,9 @@ public class yacyPeerActions { return false; } - if (connectedSeed.getName() != seed.getName()) { + /*if (connectedSeed.getName() != seed.getName()) { // TODO: update seed name lookup cache - } + }*/ } catch (NumberFormatException e) { yacyCore.log.logFine("connect: rejecting wrong peer '" + seed.getName() + "' from " + seed.getPublicAddress() + ". Cause: " + e.getMessage()); return false; diff --git a/source/de/anomic/yacy/yacyURL.java b/source/de/anomic/yacy/yacyURL.java index b0332527b..c55433828 100644 --- a/source/de/anomic/yacy/yacyURL.java +++ b/source/de/anomic/yacy/yacyURL.java @@ -28,6 +28,7 @@ package de.anomic.yacy; // and to prevent that java.net.URL usage causes DNS queries which are used in java.net. import java.io.File; +import java.io.Serializable; import java.net.MalformedURLException; import java.util.Iterator; import java.util.TreeSet; @@ -40,14 +41,17 @@ import de.anomic.server.serverDomains; import de.anomic.tools.Punycode; import de.anomic.tools.Punycode.PunycodeException; -public class yacyURL { - +public class yacyURL implements Serializable { + /** + * generated with svn4751 on 2008-05-01 + */ + private static final long serialVersionUID = -1173233022912141884L; + public static final int TLD_any_zone_filter = 255; // from TLD zones can be filtered during search; this is the catch-all filter - public static String dummyHash; + public static String dummyHash = ""; static { // create a dummy hash - dummyHash = ""; for (int i = 0; i < yacySeedDB.commonHashLength; i++) dummyHash += "-"; } diff --git a/source/de/anomic/yacy/yacyVersion.java b/source/de/anomic/yacy/yacyVersion.java index 008c082a9..57a68a14f 100644 --- a/source/de/anomic/yacy/yacyVersion.java +++ b/source/de/anomic/yacy/yacyVersion.java @@ -154,8 +154,12 @@ public final class yacyVersion implements Comparator, Comparable