From cdc7b77a620824ff100cb3043d10c7a6b2972fc1 Mon Sep 17 00:00:00 2001 From: orbiter Date: Thu, 5 Apr 2007 14:47:45 +0000 Subject: [PATCH] fix for http://www.yacy-forum.de/viewtopic.php?p=33916#33916 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3548 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- .../anomic/kelondro/kelondroMapObjects.java | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/source/de/anomic/kelondro/kelondroMapObjects.java b/source/de/anomic/kelondro/kelondroMapObjects.java index d05afcafc..593061dfa 100644 --- a/source/de/anomic/kelondro/kelondroMapObjects.java +++ b/source/de/anomic/kelondro/kelondroMapObjects.java @@ -63,20 +63,22 @@ public class kelondroMapObjects extends kelondroObjects { } Long[] longaccumulator = null; - if (longaccfields == null) accMap = null; else { - accMap = new HashMap(); - longaccumulator = new Long[longaccfields.length]; - for (int i = 0; i < longaccfields.length; i++) { - longaccumulator[i] = new Long(0); - } - } - Double[] doubleaccumulator = null; - if (doubleaccfields == null) accMap = null; else { + if ((longaccfields == null) && (doubleaccfields == null)) { + accMap = null; + } else { accMap = new HashMap(); - doubleaccumulator = new Double[doubleaccfields.length]; - for (int i = 0; i < doubleaccfields.length; i++) { - doubleaccumulator[i] = new Double(0); + if (longaccfields != null) { + longaccumulator = new Long[longaccfields.length]; + for (int i = 0; i < longaccfields.length; i++) { + longaccumulator[i] = new Long(0); + } + } + if (doubleaccfields != null) { + doubleaccumulator = new Double[doubleaccfields.length]; + for (int i = 0; i < doubleaccfields.length; i++) { + doubleaccumulator[i] = new Double(0); + } } } @@ -149,19 +151,21 @@ public class kelondroMapObjects extends kelondroObjects { sortClusterMap.put(sortfields[i], new kelondroMScoreCluster()); } } - - if (longaccfields == null) accMap = null; else { - accMap = new HashMap(); - for (int i = 0; i < longaccfields.length; i++) { - accMap.put(longaccfields[i], new Long(0)); - } - } - if (doubleaccfields == null) accMap = null; else { - accMap = new HashMap(); - for (int i = 0; i < doubleaccfields.length; i++) { - accMap.put(doubleaccfields[i], new Double(0)); - } + if ((longaccfields == null) && (doubleaccfields == null)) { + accMap = null; + } else { + accMap = new HashMap(); + if (longaccfields != null) { + for (int i = 0; i < longaccfields.length; i++) { + accMap.put(longaccfields[i], new Long(0)); + } + } + if (doubleaccfields != null) { + for (int i = 0; i < doubleaccfields.length; i++) { + accMap.put(doubleaccfields[i], new Double(0)); + } + } } }