# HG changeset patch
# User aefimov
# Date 1431678262 -10800
# Node ID e95e9042c8f31c5fe3149afdbe114592a3e32e91
# Parent  ab72c17cd492c5a7636cb76ee534989aab266f63
8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization
Reviewed-by: dfuchs, lancea, hawtin

diff -r ab72c17cd492 -r e95e9042c8f3 src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Wed Jul 15 18:40:53 2015 +0300
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java	Fri May 15 11:24:22 2015 +0300
@@ -31,6 +31,7 @@
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
 import com.sun.org.apache.xalan.internal.xsltc.runtime.AbstractTranslet;
 import java.io.IOException;
+import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamField;
@@ -38,7 +39,6 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 import javax.xml.XMLConstants;
@@ -91,7 +91,7 @@
     /**
      * Contains the list of auxiliary class definitions.
      */
-    private Map<String, Class<?>> _auxClasses = null;
+    private transient Map<String, Class<?>> _auxClasses = null;
 
     /**
      * Output properties of this translet.
@@ -139,7 +139,6 @@
      * @serialField _bytecodes byte[][] Class definition
      * @serialField _class Class[] The translet class definition(s).
      * @serialField _transletIndex int The index of the main translet class
-     * @serialField _auxClasses Hashtable The list of auxiliary class definitions.
      * @serialField _outputProperties Properties Output properties of this translet.
      * @serialField _indentNumber int Number of spaces to add for output indentation.
      */
@@ -149,7 +148,6 @@
             new ObjectStreamField("_bytecodes", byte[][].class),
             new ObjectStreamField("_class", Class[].class),
             new ObjectStreamField("_transletIndex", int.class),
-            new ObjectStreamField("_auxClasses", Hashtable.class),
             new ObjectStreamField("_outputProperties", Properties.class),
             new ObjectStreamField("_indentNumber", int.class),
         };
@@ -238,6 +236,7 @@
      *  if yes then we need to deserialize the URIResolver
      *  Fix for bugzilla bug 22438
      */
+    @SuppressWarnings("unchecked")
     private void  readObject(ObjectInputStream is)
       throws IOException, ClassNotFoundException
     {
@@ -257,13 +256,9 @@
         _class = (Class[])gf.get("_class", null);
         _transletIndex = gf.get("_transletIndex", -1);
 
-        Hashtable<String, Class<?>> aux = (Hashtable<String, Class<?>>)gf.get("_auxClasses", null);
         _outputProperties = (Properties)gf.get("_outputProperties", null);
         _indentNumber = gf.get("_indentNumber", 0);
 
-        //convert Hashtable back to HashMap
-        if (aux != null) _auxClasses = new HashMap<>(aux);
-
         if (is.readBoolean()) {
             _uriResolver = (URIResolver) is.readObject();
         }
@@ -279,8 +274,11 @@
      */
     private void writeObject(ObjectOutputStream os)
         throws IOException, ClassNotFoundException {
-        // Convert Maps to Hashtables
-        Hashtable<String, Class<?>> aux = (_auxClasses == null)? null : new Hashtable<>(_auxClasses);
+        if (_auxClasses != null) {
+            //throw with the same message as when Hashtable was used for compatibility.
+            throw new NotSerializableException(
+                    "com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable");
+        }
 
         // Write serialized fields
         ObjectOutputStream.PutField pf = os.putFields();
@@ -288,7 +286,6 @@
         pf.put("_bytecodes", _bytecodes);
         pf.put("_class", _class);
         pf.put("_transletIndex", _transletIndex);
-        pf.put("_auxClasses", aux);
         pf.put("_outputProperties", _outputProperties);
         pf.put("_indentNumber", _indentNumber);
         os.writeFields();