OpenJDK / jdk / jdk12
changeset 20976:bb128fd25c3c
Merge
| author | chegar |
|---|---|
| date | Tue, 15 Oct 2013 14:16:49 +0100 |
| parents | 298d79f9a705 30515654d2cc |
| children | 0c63befdae8a |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java Fri Oct 11 19:49:44 2013 +0100 +++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java Tue Oct 15 14:16:49 2013 +0100 @@ -1422,7 +1422,7 @@ } ch = data.charAt(currentOffset); } while (ch == ' ' || ch == 0x0A || ch == 0x09 || ch == 0x0D); - if (currentOffset == endOffset || ch == '|') { + if (currentOffset == endOffset || ch == '|' || ch == '/') { addToken(tokens, XPath.Tokens.EXPRTOKEN_PERIOD); starIsMultiplyOperator = true; break;
--- a/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java Fri Oct 11 19:49:44 2013 +0100 +++ b/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java Tue Oct 15 14:16:49 2013 +0100 @@ -99,8 +99,7 @@ * the DTMManager, it really is a proxy for this object, which * is the real DTMManager. */ - protected DTMManager m_dtmManager = DTMManager.newInstance( - com.sun.org.apache.xpath.internal.objects.XMLStringFactoryImpl.getFactory()); + protected DTMManager m_dtmManager = null; /** * Return the DTMManager object. Though XPathContext context extends