1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Thu Apr 04 19:05:24 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java Tue Apr 09 14:51:13 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -25,7 +25,6 @@ 1.11 1.12 package com.sun.xml.internal.bind.v2.runtime.unmarshaller; 1.13 1.14 -import com.sun.xml.internal.bind.v2.WellKnownNamespace; 1.15 import javax.xml.bind.annotation.DomHandler; 1.16 import javax.xml.transform.Result; 1.17 import javax.xml.transform.sax.TransformerHandler; 1.18 @@ -47,8 +46,9 @@ 1.19 * This instance is created for each unmarshalling episode. 1.20 */ 1.21 private final class State { 1.22 + 1.23 /** This handler will receive SAX events. */ 1.24 - private final TransformerHandler handler = JAXBContextImpl.createTransformerHandler(); 1.25 + private TransformerHandler handler = null; 1.26 1.27 /** {@link #handler} will produce this result. */ 1.28 private final ResultT result; 1.29 @@ -57,6 +57,7 @@ 1.30 int depth = 1; 1.31 1.32 public State( UnmarshallingContext context ) throws SAXException { 1.33 + handler = JAXBContextImpl.createTransformerHandler(context.getJAXBContext().disableSecurityProcessing); 1.34 result = dom.createUnmarshaller(context); 1.35 1.36 handler.setResult(result);