Index: xml/src/main/java/org/exolab/castor/xml/XMLContext.java =================================================================== --- xml/src/main/java/org/exolab/castor/xml/XMLContext.java (revision 8022) +++ xml/src/main/java/org/exolab/castor/xml/XMLContext.java (working copy) @@ -163,9 +163,7 @@ if (LOG.isDebugEnabled()) { LOG.debug("Creating new Marshaller instance."); } - Marshaller marshaller = new Marshaller(); - marshaller.setInternalContext(_internalContext); - return marshaller; + return new Marshaller(_internalContext); } /** Index: xml/src/main/java/org/exolab/castor/xml/Marshaller.java =================================================================== --- xml/src/main/java/org/exolab/castor/xml/Marshaller.java (revision 8034) +++ xml/src/main/java/org/exolab/castor/xml/Marshaller.java (working copy) @@ -340,10 +340,14 @@ * Creates a default instance of Marshaller, where the sink needs to be set * separately. */ - public Marshaller () { + public Marshaller() { initialize(); } + public Marshaller(final InternalContext internalContext) { + setInternalContext(internalContext); + } + /** * Creates a new Marshaller with the given writer. * @param out the Writer to serialize to