Serialization is now pluggable using the system property…

Serialization is now pluggable using the system property "h2.javaObjectSerializer". Thanks to Sergi Vladykin for the patch!

h2/src/docsrc/html/changelog.html

@@ -36,6 +36,7 @@ Change Log
 </li><li>Optimize IN(...) queries where the values are constant and of the same type.
 </li><li>Restore tool: the parameter "quiet" was not used and is now removed.
 </li><li>Fix ConcurrentModificationException when creating tables and executing SHOW TABLES in parallel. Reported by Viktor Voytovych.
+</li><li>Serialization is now pluggable using the system property "h2.javaObjectSerializer". Thanks to Sergi Vladykin for the patch!
 </li></ul>
 
 <h2>Version 1.3.169 (2012-09-09)</h2>

h2/src/main/org/h2/api/JavaObjectSerializer.java

@@ -17,7 +17,7 @@ public interface JavaObjectSerializer {
      * Serialize object to byte array.
      *
      * @param obj
-     * @return
+     * @return the byte array
      */
     byte[] serialize(Object obj) throws Exception;
 
@@ -25,7 +25,7 @@ public interface JavaObjectSerializer {
      * Deserialize object from byte array.
      *
      * @param bytes
-     * @return
+     * @return the object
      */
     Object deserialize(byte[] bytes) throws Exception;
 

h2/src/main/org/h2/constant/SysProperties.java

@@ -6,7 +6,6 @@
  */
 package org.h2.constant;
 
-import org.h2.api.JavaObjectSerializer;
 import org.h2.message.TraceSystem;
 import org.h2.util.MathUtils;
 import org.h2.util.Utils;
@@ -400,7 +399,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.javaObjectSerializer</code> (default: null).<br />
-     * {@link JavaObjectSerializer} class name for java objects being stored in column of type OTHER.
+     * The JavaObjectSerializer class name for java objects being stored in column of type OTHER.
      * It must be the same on client and server to work correctly.
      */
     public static final String JAVA_OBJECT_SERIALIZER = Utils.getProperty("h2.javaObjectSerializer", null);

h2/src/main/org/h2/util/Utils.java

@@ -31,6 +31,8 @@ import org.h2.message.DbException;
  */
 public class Utils {
 
+    public static JavaObjectSerializer serializer;
+
     /**
      * An 0-size byte array.
      */
@@ -56,8 +58,6 @@ public class Utils {
     private static HashSet<String> allowedClassNames;
     private static String[] allowedClassNamePrefixes;
 
-    public static JavaObjectSerializer serializer;
-
     static {
         String cls = SysProperties.JAVA_OBJECT_SERIALIZER;
 
@@ -267,9 +267,9 @@ public class Utils {
      */
     public static byte[] serialize(Object obj) {
         try {
-            if (serializer != null)
+            if (serializer != null) {
                 return serializer.serialize(obj);
-
+            }
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             ObjectOutputStream os = new ObjectOutputStream(out);
             os.writeObject(obj);
@@ -288,9 +288,9 @@ public class Utils {
      */
     public static Object deserialize(byte[] data) {
         try {
-            if (serializer != null)
+            if (serializer != null) {
                 return serializer.deserialize(data);
-
+            }
             ByteArrayInputStream in = new ByteArrayInputStream(data);
             ObjectInputStream is;
             if (SysProperties.USE_THREAD_CONTEXT_CLASS_LOADER) {