Restore KryoSeializer readObject(); Save before post working functionality slight refactor

Author: cogmission

src/main/java/org/numenta/nupic/network/CheckPointer.java

@@ -52,6 +52,7 @@
  *
  * @param <T>  a {@link Network} 
  */
+@FunctionalInterface
 public interface CheckPointer<T> {
     /**
      * Registers the Observer for a single notification following the checkPoint

src/main/java/org/numenta/nupic/network/KryoSerializer.java

@@ -1,10 +1,13 @@
 package org.numenta.nupic.network;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 
 import org.numenta.nupic.Persistable;
 import org.nustaq.serialization.FSTConfiguration;
 import org.nustaq.serialization.FSTObjectInput;
+import org.nustaq.serialization.FSTObjectOutput;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.KryoException;
@@ -35,6 +38,11 @@ public KryoSerializer(Class<?>... c) {
         initFST();
     }
 
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        initFST();
+    }
+
     private void initFST() {
         fastSerialConfig = FSTConfiguration.createDefaultConfiguration();
         fastSerialConfig.registerClass(classes);
@@ -48,15 +56,16 @@ private void initFST() {
      */
     @Override
     public void write(Kryo kryo, Output output, T t) {
+        FSTObjectOutput writer = fastSerialConfig.getObjectOutput(output);
         try {
             if(t instanceof Persistable) {
                 ((Persistable) t).preSerialize();
             }
-            
-            byte[] bytes = fastSerialConfig.asByteArray(t);
-            output.write(bytes);
+
+            writer.writeObject(t, t.getClass());
+            writer.flush();
         }
-        catch(Exception e) {
+        catch(IOException e) {
             throw new KryoException(e);
         }
     }

src/main/java/org/numenta/nupic/network/NetworkSerializerImpl.java

@@ -91,8 +91,6 @@ class NetworkSerializerImpl<T extends Persistable> extends Serializer<T> impleme
     /** Stores the bytes of the last serialized object or null if there was a problem */
     private static AtomicReference<byte[]> lastBytes = new AtomicReference<byte[]>(null);
 
-    
-    
     /** 
      * All instances in this classloader will share the same atomic reference to the last checkpoint file name holder
      * which is perfectly fine.