diff -r 000000000000 -r 373ffda63c9a src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java	Wed Apr 27 01:27:09 2016 +0800
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1997, 2011, 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.bind.v2.runtime.unmarshaller;
+
+import java.net.URL;
+
+import javax.xml.bind.ValidationEventLocator;
+
+import org.xml.sax.Locator;
+import org.w3c.dom.Node;
+
+/**
+ * Object that returns the current location that the {@link XmlVisitor} is parsing.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface LocatorEx extends Locator {
+    /**
+     * Gets the current location in a {@link ValidationEventLocator} object.
+     */
+    ValidationEventLocator getLocation();
+
+    /**
+     * Immutable snapshot of a {@link LocatorEx}
+     */
+    public static final class Snapshot implements LocatorEx, ValidationEventLocator {
+        private final int columnNumber,lineNumber,offset;
+        private final String systemId,publicId;
+        private final URL url;
+        private final Object object;
+        private final Node node;
+
+        public Snapshot(LocatorEx loc) {
+            columnNumber = loc.getColumnNumber();
+            lineNumber = loc.getLineNumber();
+            systemId = loc.getSystemId();
+            publicId = loc.getPublicId();
+
+            ValidationEventLocator vel = loc.getLocation();
+            offset = vel.getOffset();
+            url = vel.getURL();
+            object = vel.getObject();
+            node = vel.getNode();
+        }
+
+        public Object getObject() {
+            return object;
+        }
+
+        public Node getNode() {
+            return node;
+        }
+
+        public int getOffset() {
+            return offset;
+        }
+
+        public URL getURL() {
+            return url;
+        }
+
+        public int getColumnNumber() {
+            return columnNumber;
+        }
+
+        public int getLineNumber() {
+            return lineNumber;
+        }
+
+        public String getSystemId() {
+            return systemId;
+        }
+
+        public String getPublicId() {
+            return publicId;
+        }
+
+        public ValidationEventLocator getLocation() {
+            return this;
+        }
+    }
+}