diff -r 88b85470e72c -r f50545b5e2f1 src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java	Tue Mar 06 16:09:35 2012 -0800
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1997, 2010, 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.client;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.model.SOAPSEIModel;
+
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * {@link PortInfo} that has {@link SEIModel}.
+ *
+ * This object is created statically when {@link WSServiceDelegate} is created
+ * with an service interface.
+ *
+ * NOTE: Made this class public so that Dispatch instances derived from a
+ *       'parent' SEI-based port instance (generally for sending protocol
+ *       messages or request retries) can still know what the parent's SEI was.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class SEIPortInfo extends PortInfo {
+    public final Class sei;
+    /**
+     * Model of {@link #sei}.
+     */
+    public final SOAPSEIModel model;
+
+    public SEIPortInfo(WSServiceDelegate owner, Class sei, SOAPSEIModel model, @NotNull WSDLPort portModel) {
+        super(owner,portModel);
+        this.sei = sei;
+        this.model = model;
+        assert sei!=null && model!=null;
+    }
+
+    public BindingImpl createBinding(WebServiceFeatureList webServiceFeatures, Class<?> portInterface) {
+        // not to pass in (BindingImpl) model.getWSBinding()
+        BindingImpl bindingImpl = super.createBinding(webServiceFeatures, portInterface, null);
+        if(bindingImpl instanceof SOAPBindingImpl) {
+            ((SOAPBindingImpl)bindingImpl).setPortKnownHeaders(model.getKnownHeaders());
+        }
+         //Not needed as set above in super.createBinding() call
+         //bindingImpl.setFeatures(webServiceFeatures);
+        return bindingImpl;
+    }
+}