--- old/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java	2013-04-04 15:27:13.492612865 +0200
+++ new/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java	2013-04-04 15:27:13.440612865 +0200
@@ -31,6 +31,7 @@
 import java.util.List;
 
 import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.UnmarshallerHandler;
 import javax.xml.validation.ValidatorHandler;
 
@@ -45,7 +46,6 @@
 import com.sun.xml.internal.xsom.XSAnnotation;
 import com.sun.xml.internal.xsom.XSComponent;
 import com.sun.xml.internal.xsom.XSSchemaSet;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
 
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -217,7 +217,7 @@
     public void apply(XSSchemaSet schema, ErrorReceiver errorReceiver) {
         if(topLevel!=null) {
             this.errorReceiver = errorReceiver;
-            UnmarshallerImpl u = BindInfo.getJAXBContext().createUnmarshaller();
+            Unmarshaller u =  BindInfo.getCustomizationUnmarshaller();
             this.unmarshaller = u.getUnmarshallerHandler();
             ValidatorHandler v = BindInfo.bindingFileSchema.newValidator();
             v.setErrorHandler(errorReceiver);