value serializer in stack instead of field #646

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/io/BytesHandle.java

@@ -99,6 +99,13 @@ public BytesHandle(byte[] content) {
     this();
     set(content);
   }
+  /**
+   * Initializes the handle from the byte content of another handle
+   * @param content	the other handle
+   */
+  public BytesHandle(BufferableHandle content) {
+    this((content == null) ? null : content.toBuffer());
+  }
 
   /**
    * Returns the byte array for the handle content.

marklogic-client-api/src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java

@@ -307,13 +307,12 @@ public void add(String key, String value) {
     }
   }
 
-  private DocumentCollections collections;
-  private DocumentPermissions permissions;
-  private DocumentProperties  properties;
-  private int                 quality = 0;
+  private DocumentCollections    collections;
+  private DocumentPermissions    permissions;
+  private DocumentProperties     properties;
+  private int                    quality = 0;
   private DocumentMetadataValues metadataValues;
-  private boolean             qualityModified = false;
-  private ValueSerializer     valueSerializer;
+  private boolean                qualityModified = false;
 
   /**
    * Zero-argument constructor.
@@ -772,8 +771,6 @@ private void sendMetadataImpl(OutputStream out) {
     try {
       XMLOutputFactory factory = XmlFactories.getOutputFactory();
 
-      valueSerializer = null;
-
       XMLStreamWriter serializer = factory.createXMLStreamWriter(out, "UTF-8");
 
       serializer.writeStartDocument("utf-8", "1.0");
@@ -803,8 +800,6 @@ private void sendMetadataImpl(OutputStream out) {
       throw new MarkLogicIOException("Failed to serialize metadata", e);
     } catch (TransformerException e) {
       throw new MarkLogicIOException("Failed to serialize metadata", e);
-    } finally {
-      valueSerializer = null;
     }
   }
 
@@ -859,6 +854,9 @@ private void sendPermissionsImpl(XMLStreamWriter serializer) throws XMLStreamExc
   }
   private void sendPropertiesImpl(final XMLStreamWriter serializer) throws XMLStreamException, TransformerFactoryConfigurationError, TransformerException {
     if ( getProperties() == null || getProperties().size() == 0 ) return;
+
+    ValueSerializer valueSerializer = null;
+
     serializer.writeStartElement("prop", "properties", PROPERTY_API_NS);
 
     for (Map.Entry<QName, Object> property: getProperties().entrySet()) {
@@ -894,6 +892,8 @@ private void sendPropertiesImpl(final XMLStreamWriter serializer) throws XMLStre
     }
 
     serializer.writeEndElement();
+
+    valueSerializer = null;
   }
   private void sendQualityImpl(XMLStreamWriter serializer) throws XMLStreamException {
     if ( qualityModified == false ) return;