--- old/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java	2013-04-04 15:28:31.192614075 +0200
+++ new/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java	2013-04-04 15:28:31.136614074 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -35,10 +35,8 @@
 import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
 import com.sun.xml.internal.ws.encoding.XMLHTTPBindingCodec;
 import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants;
-import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
 import com.sun.xml.internal.ws.util.ServiceFinder;
 import com.sun.xml.internal.ws.developer.JAXWSProperties;
-import static com.sun.xml.internal.ws.binding.WebServiceFeatureList.toFeatureArray;
 
 import javax.xml.ws.BindingType;
 import javax.xml.ws.WebServiceException;
@@ -157,6 +155,7 @@
      * @return
      *      Always non-null same value.
      */
+    @Override
     public abstract String toString();
 
     /**
@@ -218,12 +217,14 @@
     /**
      * Compares the equality based on {@link #toString()}.
      */
+    @Override
     public boolean equals(Object obj) {
         if(!(obj instanceof BindingID))
             return false;
         return toString().equals(obj.toString());
     }
 
+    @Override
     public int hashCode() {
         return toString().hashCode();
     }
@@ -353,6 +354,7 @@
      * Constant that represents REST.
      */
     public static final BindingID XML_HTTP = new Impl(SOAPVersion.SOAP_11, HTTPBinding.HTTP_BINDING,false) {
+        @Override
         public Codec createEncoder(WSBinding binding) {
             return new XMLHTTPBindingCodec(binding.getFeatures());
         }
@@ -362,6 +364,7 @@
      * Constant that represents REST.
      */
     private static final BindingID REST_HTTP = new Impl(SOAPVersion.SOAP_11, JAXWSProperties.REST_BINDING,true) {
+        @Override
         public Codec createEncoder(WSBinding binding) {
             return new XMLHTTPBindingCodec(binding.getFeatures());
         }
@@ -378,15 +381,18 @@
             this.canGenerateWSDL = canGenerateWSDL;
         }
 
+        @Override
         public SOAPVersion getSOAPVersion() {
             return version;
         }
 
+        @Override
         public String toString() {
             return lexical;
         }
 
         @Deprecated
+        @Override
         public boolean canGenerateWSDL() {
             return canGenerateWSDL;
         }
@@ -399,7 +405,6 @@
         /*final*/ Map<String,String> parameters = new HashMap<String,String>();
 
         static final String MTOM_PARAM = "mtom";
-        Boolean mtomSetting = null;
 
         public SOAPHTTPImpl(SOAPVersion version, String lexical, boolean canGenerateWSDL) {
             super(version, lexical, canGenerateWSDL);
@@ -410,10 +415,9 @@
             this(version, lexical, canGenerateWSDL);
             String mtomStr = mtomEnabled ? "true" : "false";
             parameters.put(MTOM_PARAM, mtomStr);
-            mtomSetting = mtomEnabled;
         }
 
-        public @NotNull Codec createEncoder(WSBinding binding) {
+        public @NotNull @Override Codec createEncoder(WSBinding binding) {
             return new SOAPBindingCodec(binding.getFeatures());
         }
 
@@ -422,6 +426,7 @@
             return mtom==null?null:Boolean.valueOf(mtom);
         }
 
+        @Override
         public WebServiceFeatureList createBuiltinFeatureList() {
             WebServiceFeatureList r=super.createBuiltinFeatureList();
             Boolean mtom = isMTOMEnabled();
@@ -430,10 +435,16 @@
             return r;
         }
 
+        @Override
         public String getParameter(String parameterName, String defaultValue) {
             if (parameters.get(parameterName) == null)
                 return super.getParameter(parameterName, defaultValue);
             return parameters.get(parameterName);
         }
+
+        @Override
+        public SOAPHTTPImpl clone() throws CloneNotSupportedException {
+            return (SOAPHTTPImpl) super.clone();
+        }
     }
 }