--- /dev/null	Mon Nov 17 20:06:02 2014
+++ new/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java	Mon Nov 17 20:06:01 2014
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2014, 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.
+ *
+ * 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 javax.xml.stream.XMLStreamReaderTest;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/*
+ * @summary Test XMLStreamReader.hasName() returns false for ENTITY_REFERENCE.
+ */
+public class StreamReaderTest {
+
+    /**
+     * CR 6631264 / sjsxp Issue 45:
+     * https://sjsxp.dev.java.net/issues/show_bug.cgi?id=45
+     * XMLStreamReader.hasName() should return false for ENTITY_REFERENCE
+     */
+    @Test
+    public void testHasNameOnEntityEvent() throws Exception {
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        xif.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
+        XMLStreamReader r = xif.createXMLStreamReader(this.getClass().getResourceAsStream("ExternalDTD.xml"));
+        while (r.next() != XMLStreamConstants.ENTITY_REFERENCE) {
+            System.out.println("event type: " + r.getEventType());
+            continue;
+        }
+        if (r.hasName()) {
+            System.out.println("hasName returned true on ENTITY_REFERENCE event.");
+        }
+        Assert.assertFalse(r.hasName()); // fails
+    }
+
+}