Changeset 29484 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/CompressLZF.java

Timestamp:

2013-04-07T17:07:27+02:00 (12 years ago)

Author:

akks

Message:

JOSM/ImageryCache: updated MapDB (no more deadlocks, Java 1.6 compatible), less crashes, multiple-JOSM support

File:

• applications/editors/josm/plugins/imagerycache/src/org/mapdb/CompressLZF.java (modified) (3 diffs)

applications/editors/josm/plugins/imagerycache/src/org/mapdb/CompressLZF.java

@@ -53 +53 @@
 import java.io.DataOutput;
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Arrays;
 
@@ -297 +296 @@
         @Override
         public void serialize(DataOutput out, byte[] value) throws IOException {
-            if (value == null) return;
+            if (value == null|| value.length==0){
+                //in this case do not compress data, write 0 as indicator
+                Utils.packInt(out, 0);
+                out.write(value);
+                return;
+            }
 
             CompressLZF lzf = LZF.get();
@@ -341 +345 @@
      * Wraps existing serializer and compresses its input/output
      */
-    public static <E> Serializer<E> serializerCompressWrapper(Serializer<E> serializer) {
-        return new SerializerCompressWrapper<E>(serializer);
-    }
-
-
-    protected static class SerializerCompressWrapper<E> implements Serializer<E>, Serializable {
-        protected final Serializer<E> serializer;
-        public SerializerCompressWrapper(Serializer<E> serializer) {
-            this.serializer = serializer;
-        }
-
-        @Override
-        public void serialize(DataOutput out, E value) throws IOException {
-            //serialize to byte[]
-            DataOutput2 out2 = new DataOutput2();
-            serializer.serialize(out2, value);
-            byte[] b = out2.copyBytes();
-            CompressLZF.SERIALIZER.serialize(out, b);
-        }
-
-        @Override
-        public E deserialize(DataInput in, int available) throws IOException {
-            byte[] b = CompressLZF.SERIALIZER.deserialize(in, available);
-            DataInput2 in2 = new DataInput2(b);
-            return serializer.deserialize(in2, b.length);
-        }
-    }
+    public static <E> Serializer<E> CompressionWrapper(Serializer<E> serializer) {
+        return new Serializer.CompressSerializerWrapper<E>(serializer);
+    }
+
 
 }