diff -r 000000000000 -r 373ffda63c9a src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java	Wed Apr 27 01:27:09 2016 +0800
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 1997, 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.ws.server.provider;
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Messages;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.encoding.xml.XMLMessage;
+import com.sun.xml.internal.ws.resources.ServerMessages;
+
+import javax.activation.DataSource;
+import javax.xml.transform.Source;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.http.HTTPException;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+abstract class XMLProviderArgumentBuilder<T> extends ProviderArgumentsBuilder<T> {
+
+    @Override
+    protected Packet getResponse(Packet request, Exception e, WSDLPort port, WSBinding binding) {
+        Packet response = super.getResponse(request, e, port, binding);
+        if (e instanceof HTTPException) {
+            if (response.supports(MessageContext.HTTP_RESPONSE_CODE)) {
+                response.put(MessageContext.HTTP_RESPONSE_CODE, ((HTTPException)e).getStatusCode());
+            }
+        }
+        return response;
+    }
+
+    static XMLProviderArgumentBuilder createBuilder(ProviderEndpointModel model, WSBinding binding) {
+        if (model.mode == Service.Mode.PAYLOAD) {
+            return new PayloadSource();
+        } else {
+            if(model.datatype==Source.class)
+                return new PayloadSource();
+            if(model.datatype== DataSource.class)
+                return new DataSourceParameter(binding);
+            throw new WebServiceException(ServerMessages.PROVIDER_INVALID_PARAMETER_TYPE(model.implClass,model.datatype));
+        }
+    }
+
+    private static final class PayloadSource extends XMLProviderArgumentBuilder<Source> {
+        public Source getParameter(Packet packet) {
+            return packet.getMessage().readPayloadAsSource();
+        }
+
+        public Message getResponseMessage(Source source) {
+            return Messages.createUsingPayload(source, SOAPVersion.SOAP_11);
+        }
+
+        protected Message getResponseMessage(Exception e) {
+            return XMLMessage.create(e);
+        }
+    }
+
+    private static final class DataSourceParameter extends XMLProviderArgumentBuilder<DataSource> {
+        private final WSBinding binding;
+
+        DataSourceParameter(WSBinding binding) {
+            this.binding = binding;
+        }
+        public DataSource getParameter(Packet packet) {
+            Message msg = packet.getInternalMessage();
+            return (msg instanceof XMLMessage.MessageDataSource)
+                    ? ((XMLMessage.MessageDataSource) msg).getDataSource()
+                    : XMLMessage.getDataSource(msg, binding.getFeatures());
+        }
+
+        public Message getResponseMessage(DataSource ds) {
+            return XMLMessage.create(ds, binding.getFeatures());
+        }
+
+        protected Message getResponseMessage(Exception e) {
+            return XMLMessage.create(e);
+        }
+    }
+
+}