From df71776929b3a56337f33e8f1b2711bc70d8cc52 Mon Sep 17 00:00:00 2001
From: f1ori <f1ori@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 21 Mar 2011 19:42:22 +0000
Subject: [PATCH] * fix bug #7 * log requires poison to finish, so Base64Order
 main-function doesn't finish, when called from debian configure script

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7616 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 addon/yacyInit.m4                               | 2 +-
 debian/control                                  | 2 +-
 source/net/yacy/kelondro/order/Base64Order.java | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4
index 04326d25a..fecaa711b 100644
--- a/addon/yacyInit.m4
+++ b/addon/yacyInit.m4
@@ -100,7 +100,7 @@ fi
 cd $YACY_HOME
 
 #get javastart args
-if [ -f DATA/SETTINGS/yacy.conf ]
+if [ -s DATA/SETTINGS/yacy.conf ]
 then
 	# startup memory
 	for i in Xmx Xms; do
diff --git a/debian/control b/debian/control
index 438e2ec39..209efa525 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: yacy
 Section: network
 Priority: extra
 Maintainer: root <root@debian>
-Build-Depends: ant, sun-java5-jdk | openjdk-6-jdk, debhelper (>= 5), m4
+Build-Depends: ant, sun-java6-jdk | openjdk-6-jdk, debhelper (>= 5), m4
 Standards-Version: 3.7.2
 
 Package: yacy
diff --git a/source/net/yacy/kelondro/order/Base64Order.java b/source/net/yacy/kelondro/order/Base64Order.java
index cba612960..71c38736f 100644
--- a/source/net/yacy/kelondro/order/Base64Order.java
+++ b/source/net/yacy/kelondro/order/Base64Order.java
@@ -32,7 +32,6 @@ import java.util.Comparator;
 import net.yacy.cora.document.UTF8;
 import net.yacy.kelondro.index.HandleSet;
 import net.yacy.kelondro.index.RowSpaceExceededException;
-import net.yacy.kelondro.logging.Log;
 
 
 public class Base64Order extends AbstractOrder<byte[]> implements ByteOrder, Comparator<byte[]>, Cloneable {
@@ -53,8 +52,6 @@ public class Base64Order extends AbstractOrder<byte[]> implements ByteOrder, Com
         }
     }
 
-    private final Log log;
-
     public static final Base64Order standardCoder = new Base64Order(true, true);
     public static final Base64Order enhancedCoder = new Base64Order(true, false);
 
@@ -85,7 +82,6 @@ public class Base64Order extends AbstractOrder<byte[]> implements ByteOrder, Com
                 ab[(ac << 7) | bc] = c;
             }
         }
-        this.log = new Log("BASE64");
     }
     
     public HandleSet getHandleSet(final int keylength, final int space) throws RowSpaceExceededException {
@@ -301,8 +297,9 @@ public class Base64Order extends AbstractOrder<byte[]> implements ByteOrder, Com
             return out;
         } catch (final ArrayIndexOutOfBoundsException e) {
             // maybe the input was not base64
+            // TODO: Throw exception again
             // throw new RuntimeException("input probably not base64");
-            if (this.log.isFine()) this.log.logFine("wrong string receive: " + in);
+            System.err.println("wrong string receive: " + in);
             return new byte[0];
         }
     }