fix for NPE and small performance enhancement

yacy · Aug 10, 2016 · 103a834 · 103a834
1 parent 2910fe3
commit 103a834
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/source/net/yacy/kelondro/blob/BEncodedHeap.java b/source/net/yacy/kelondro/blob/BEncodedHeap.java
@@ -201,10 +201,9 @@ private static Map<String, byte[]> b2m(final byte[] b) {
         final Map<String, BDecoder.BObject> map = bobj.getMap();
         final Map<String, byte[]> m = new HashMap<String, byte[]>();
         for ( final Map.Entry<String, BDecoder.BObject> entry : map.entrySet() ) {
-            if ( entry.getValue().getType() != BDecoder.BType.string ) {
-                continue;
-            }
-            m.put(entry.getKey(), entry.getValue().getString());
+            BObject ev = entry.getValue();
+            if ( ev == null || ev.getType() != BDecoder.BType.string ) continue;
+            m.put(entry.getKey(), ev.getString());
         }
         return m;
     }
@@ -688,11 +687,8 @@ public static void main(final String[] args) {
                 m.put("k", "222".getBytes());
                 map.insert("789".getBytes(), m);
                 // iterate over keys
-                Map.Entry<byte[], Map<String, byte[]>> entry;
-                final Iterator<Map.Entry<byte[], Map<String, byte[]>>> i = map.iterator();
-                while ( i.hasNext() ) {
-                    entry = i.next();
-                    System.out.println(ASCII.String(entry.getKey()) + ": " + entry.getValue());
+                for (Map.Entry<byte[], Map<String, byte[]>> entry : map) {
+                    System.out.println(ASCII.String(entry.getKey()) + ": " + ASCII.String(entry.getValue().values().iterator().next()));
                 }
                 // clean up
                 map.close();