diff -r 88b85470e72c -r f50545b5e2f1 src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java	Tue Mar 06 16:09:35 2012 -0800
@@ -0,0 +1,180 @@
+/*
+ * 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.handler;
+
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Attachment;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.message.DataHandlerAttachment;
+import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
+import com.sun.xml.internal.ws.spi.db.BindingContext;
+
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.WebServiceException;
+import javax.activation.DataHandler;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ *
+ * @author WS Development Team
+ */
+public class ServerLogicalHandlerTube extends HandlerTube {
+
+    private SEIModel seiModel;
+
+    /**
+     * Creates a new instance of LogicalHandlerTube
+     */
+    public ServerLogicalHandlerTube(WSBinding binding, SEIModel seiModel, WSDLPort port, Tube next) {
+        super(next, port, binding);
+        this.seiModel = seiModel;
+        setUpHandlersOnce();
+    }
+
+    /**
+     * This constructor is used on client-side where, SOAPHandlerTube is created
+     * first and then a LogicalHandlerTube is created with a handler to that
+     * SOAPHandlerTube.
+     * With this handle, LogicalHandlerTube can call
+     * SOAPHandlerTube.closeHandlers()
+     */
+    public ServerLogicalHandlerTube(WSBinding binding, SEIModel seiModel, Tube next, HandlerTube cousinTube) {
+        super(next, cousinTube, binding);
+        this.seiModel = seiModel;
+        setUpHandlersOnce();
+    }
+
+    /**
+     * Copy constructor for {@link com.sun.xml.internal.ws.api.pipe.Tube#copy(com.sun.xml.internal.ws.api.pipe.TubeCloner)}.
+     */
+
+    private ServerLogicalHandlerTube(ServerLogicalHandlerTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.seiModel = that.seiModel;
+        this.handlers = that.handlers;
+    }
+
+    //should be overridden by DriverHandlerTubes
+    @Override
+    protected void initiateClosing(MessageContext mc) {
+         if (getBinding().getSOAPVersion() != null) {
+            super.initiateClosing(mc);
+        } else {
+            close(mc);
+            super.initiateClosing(mc);
+        }
+    }
+
+   public AbstractFilterTubeImpl copy(TubeCloner cloner) {
+        return new ServerLogicalHandlerTube(this, cloner);
+    }
+
+    private void setUpHandlersOnce() {
+        handlers = new ArrayList<Handler>();
+        List<LogicalHandler> logicalSnapShot= ((BindingImpl) getBinding()).getHandlerConfig().getLogicalHandlers();
+        if (!logicalSnapShot.isEmpty()) {
+            handlers.addAll(logicalSnapShot);
+        }
+    }
+
+    protected void resetProcessor() {
+        processor = null;
+    }
+
+    void setUpProcessor() {
+        if (!handlers.isEmpty() && processor == null) {
+            if (getBinding().getSOAPVersion() == null) {
+                processor = new XMLHandlerProcessor(this, getBinding(),
+                        handlers);
+            } else {
+                processor = new SOAPHandlerProcessor(false, this, getBinding(), handlers);
+            }
+        }
+    }
+
+    MessageUpdatableContext getContext(Packet packet) {
+        return new LogicalMessageContextImpl(getBinding(), getBindingContext(), packet);
+    }
+
+    private BindingContext getBindingContext() {
+        return (seiModel!= null && seiModel instanceof AbstractSEIModelImpl) ?
+                ((AbstractSEIModelImpl)seiModel).getBindingContext() : null;
+        }
+
+    boolean callHandlersOnRequest(MessageUpdatableContext context, boolean isOneWay) {
+
+        boolean handlerResult;
+        try {
+            //SERVER-SIDE
+            handlerResult = processor.callHandlersRequest(HandlerProcessor.Direction.INBOUND, context, !isOneWay);
+
+        } catch (RuntimeException re) {
+            remedyActionTaken = true;
+            throw re;
+        }
+        if (!handlerResult) {
+            remedyActionTaken = true;
+        }
+        return handlerResult;
+    }
+
+    void callHandlersOnResponse(MessageUpdatableContext context, boolean handleFault) {
+        //Lets copy all the MessageContext.OUTBOUND_ATTACHMENT_PROPERTY to the message
+        Map<String, DataHandler> atts = (Map<String, DataHandler>) context.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
+        AttachmentSet attSet = context.packet.getMessage().getAttachments();
+        for(String cid : atts.keySet()){
+            Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
+            attSet.add(att);
+        }
+
+        try {
+            //SERVER-SIDE
+            processor.callHandlersResponse(HandlerProcessor.Direction.OUTBOUND, context, handleFault);
+
+        } catch (WebServiceException wse) {
+            //no rewrapping
+            throw wse;
+        } catch (RuntimeException re) {
+            throw re;
+        }
+    }
+
+    void closeHandlers(MessageContext mc) {
+        closeServersideHandlers(mc);
+
+    }
+}