--- old/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java	2015-10-22 23:50:10.000000000 +0200
+++ new/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java	2015-10-22 23:50:10.000000000 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@
 
     public com.oracle.webservices.internal.api.message.MessageContext createContext(SOAPMessage soap) {
         throwIfIllegalMessageArgument(soap);
+        if (saajFactory!= null) return packet(saajFactory.createMessage(soap));
         return packet(Messages.create(soap));
     }
 
@@ -162,6 +163,7 @@
         if (mf != null) {
             p.setMtomFeature(mf);
         }
+        p.setSAAJFactory(saajFactory);
         return p;
     }