From 442807cb298470ec7d8b847e1af6e46deab6982f Mon Sep 17 00:00:00 2001 From: theli Date: Tue, 31 Jan 2006 15:26:11 +0000 Subject: [PATCH] *) Bugfix for last commit git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1506 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/IndexImport_p.java | 4 ++-- source/de/anomic/plasma/dbImport/dbImportManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htroot/IndexImport_p.java b/htroot/IndexImport_p.java index 0da035991..a6aae066c 100644 --- a/htroot/IndexImport_p.java +++ b/htroot/IndexImport_p.java @@ -183,7 +183,7 @@ public final class IndexImport_p { prop.put("running.jobs_" + i + "_percent", Integer.toString(currThread.getProcessingStatusPercent())); prop.put("running.jobs_" + i + "_elapsed", serverDate.intervalToString(currThread.getElapsedTime())); prop.put("running.jobs_" + i + "_estimated", serverDate.intervalToString(currThread.getEstimatedTime())); - prop.put("running.jobs_" + i + "_status", currThread.getStatus().replace("\n", "
")); + prop.put("running.jobs_" + i + "_status", currThread.getStatus().replaceAll("\n", "
")); // job number of the importer thread prop.put("running.jobs_" + i + "_job_nr", Integer.toString(currThread.getJobID())); @@ -210,7 +210,7 @@ public final class IndexImport_p { } prop.put("finished.jobs_" + i + "_percent", Integer.toString(currThread.getProcessingStatusPercent())); prop.put("finished.jobs_" + i + "_elapsed", serverDate.intervalToString(currThread.getElapsedTime())); - prop.put("finished.jobs_" + i + "_status", currThread.getStatus().replace("\n", "
")); + prop.put("finished.jobs_" + i + "_status", currThread.getStatus().replaceAll("\n", "
")); } prop.put("finished.jobs",finishedJobs.length); diff --git a/source/de/anomic/plasma/dbImport/dbImportManager.java b/source/de/anomic/plasma/dbImport/dbImportManager.java index 8a18202ea..7bc02680c 100644 --- a/source/de/anomic/plasma/dbImport/dbImportManager.java +++ b/source/de/anomic/plasma/dbImport/dbImportManager.java @@ -46,7 +46,7 @@ public class dbImportManager { for (int i=0; i < activeCount; i++) { dbImporter currThread = (dbImporter) importThreads[i]; - if (currThread.getJobID() == Integer.valueOf(jobID).intValue()) { + if (currThread.getJobID() == jobID) { return currThread; } }