* 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
pull/1/head
f1ori 14 years ago
parent 9f0286b380
commit df71776929

@ -100,7 +100,7 @@ fi
cd $YACY_HOME cd $YACY_HOME
#get javastart args #get javastart args
if [ -f DATA/SETTINGS/yacy.conf ] if [ -s DATA/SETTINGS/yacy.conf ]
then then
# startup memory # startup memory
for i in Xmx Xms; do for i in Xmx Xms; do

2
debian/control vendored

@ -2,7 +2,7 @@ Source: yacy
Section: network Section: network
Priority: extra Priority: extra
Maintainer: root <root@debian> 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 Standards-Version: 3.7.2
Package: yacy Package: yacy

@ -32,7 +32,6 @@ import java.util.Comparator;
import net.yacy.cora.document.UTF8; import net.yacy.cora.document.UTF8;
import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.index.HandleSet;
import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.index.RowSpaceExceededException;
import net.yacy.kelondro.logging.Log;
public class Base64Order extends AbstractOrder<byte[]> implements ByteOrder, Comparator<byte[]>, Cloneable { 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 standardCoder = new Base64Order(true, true);
public static final Base64Order enhancedCoder = new Base64Order(true, false); 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; ab[(ac << 7) | bc] = c;
} }
} }
this.log = new Log("BASE64");
} }
public HandleSet getHandleSet(final int keylength, final int space) throws RowSpaceExceededException { 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; return out;
} catch (final ArrayIndexOutOfBoundsException e) { } catch (final ArrayIndexOutOfBoundsException e) {
// maybe the input was not base64 // maybe the input was not base64
// TODO: Throw exception again
// throw new RuntimeException("input probably not base64"); // 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]; return new byte[0];
} }
} }

Loading…
Cancel
Save