diff -r 88b85470e72c -r f50545b5e2f1 src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java	Tue Mar 06 16:09:35 2012 -0800
@@ -0,0 +1,138 @@
+/*
+ * 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.xml.internal.ws.api.handler.MessageHandler;
+import com.sun.xml.internal.ws.handler.HandlerException;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.soap.SOAPHandler;
+import java.util.*;
+
+/**
+ * This class holds the handler information and roles on the Binding (mutable info in the binding).
+ *
+ * HandlerConfiguration is immutable, and a new object is created when the BindingImpl is created or User calls
+ * Binding.setHandlerChain() or SOAPBinding.setRoles().
+ *
+ * During invocation in Stub.process(), snapshot of the handler configuration is set in Packet.handlerConfig. The
+ * information in the HandlerConfiguration is used by MUPipe and HandlerTube implementations.
+ *
+ * @author Rama Pulavarthi
+ */
+public class HandlerConfiguration {
+    private final Set<String> roles;
+    /**
+     * This chain may contain both soap and logical handlers.
+     */
+    private final List<Handler> handlerChain;
+    private final List<LogicalHandler> logicalHandlers;
+    private final List<SOAPHandler> soapHandlers;
+    private final List<MessageHandler> messageHandlers;
+    private Set<QName> handlerKnownHeaders;
+
+    /**
+     * @param roles               This contains the roles assumed by the Binding implementation.
+     * @param handlerChain        This contains the handler chain set on the Binding
+     */
+    public HandlerConfiguration(Set<String> roles, List<Handler> handlerChain) {
+        this.roles = roles;
+        this.handlerChain = handlerChain;
+        logicalHandlers = new ArrayList<LogicalHandler>();
+        soapHandlers = new ArrayList<SOAPHandler>();
+        messageHandlers = new ArrayList<MessageHandler>();
+        handlerKnownHeaders = new HashSet<QName>();
+
+        for (Handler handler : handlerChain) {
+            if (handler instanceof LogicalHandler) {
+                logicalHandlers.add((LogicalHandler) handler);
+            } else if (handler instanceof SOAPHandler) {
+                soapHandlers.add((SOAPHandler) handler);
+                Set<QName> headers = ((SOAPHandler<?>) handler).getHeaders();
+                if (headers != null) {
+                    handlerKnownHeaders.addAll(headers);
+                }
+            } else if (handler instanceof MessageHandler) {
+                messageHandlers.add((MessageHandler) handler);
+                Set<QName> headers = ((MessageHandler<?>) handler).getHeaders();
+                if (headers != null) {
+                    handlerKnownHeaders.addAll(headers);
+                }
+            }else {
+                throw new HandlerException("handler.not.valid.type",
+                    handler.getClass());
+            }
+        }
+    }
+
+    /**
+     * This is called when roles as reset on binding using SOAPBinding#setRoles(), to save reparsing the handlers again.
+     * @param roles
+     * @param oldConfig
+     */
+    public HandlerConfiguration(Set<String> roles, HandlerConfiguration oldConfig) {
+        this.roles = roles;
+        this.handlerChain = oldConfig.handlerChain;
+        this.logicalHandlers = oldConfig.logicalHandlers;
+        this.soapHandlers = oldConfig.soapHandlers;
+        this.messageHandlers = oldConfig.messageHandlers;
+        this.handlerKnownHeaders = oldConfig.handlerKnownHeaders;
+    }
+
+    public Set<String> getRoles() {
+        return roles;
+    }
+
+    /**
+     *
+     * @return return a copy of handler chain
+     */
+    public List<Handler> getHandlerChain() {
+        if(handlerChain == null)
+            return Collections.emptyList();
+        return new ArrayList<Handler>(handlerChain);
+
+    }
+
+    public List<LogicalHandler> getLogicalHandlers() {
+        return logicalHandlers;
+    }
+
+    public List<SOAPHandler> getSoapHandlers() {
+        return soapHandlers;
+    }
+
+    public List<MessageHandler> getMessageHandlers() {
+        return messageHandlers;
+    }
+
+    public Set<QName> getHandlerKnownHeaders() {
+        return handlerKnownHeaders;
+    }
+
+}