# HG changeset patch # User aefimov # Date 1506950423 -3600 # Node ID d9877e4e1f2b84201aa431e82fce648e69f02e65 # Parent 31ab5999e55190b11f85b4560c29b2c21d33f81e 8159240: XSOM parser incorrectly processes type names with whitespaces Reviewed-by: coffeys diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class attributeDeclBody extends NGCCHandler { private String name; @@ -458,7 +451,7 @@ break; case 11: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 10; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,14 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class attributeGroupDecl extends NGCCHandler { private AnnotationImpl annotation; @@ -401,7 +393,7 @@ break; case 12: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 11; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,17 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; + +import java.util.Collections; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class complexType extends NGCCHandler { private Integer finalValue; @@ -1683,7 +1678,7 @@ break; case 70: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 69; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class elementDeclBody extends NGCCHandler { private Integer finalValue; @@ -813,7 +809,7 @@ break; case 22: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 21; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,15 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class group extends NGCCHandler { private AnnotationImpl annotation; @@ -403,7 +396,7 @@ break; case 9: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 8; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,18 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.*; +import com.sun.xml.internal.xsom.parser.*; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class identityConstraint extends NGCCHandler { private String name; @@ -471,7 +467,7 @@ switch($_ngcc_current_state) { case 15: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 14; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,16 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class notation extends NGCCHandler { private String name; @@ -435,7 +429,7 @@ break; case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,12 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; class qname extends NGCCHandler { private String qvalue; @@ -150,7 +140,7 @@ break; case 1: { - qvalue = $value; + qvalue = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 0; } break; diff -r 31ab5999e551 -r d9877e4e1f2b src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Tue Oct 10 12:47:11 2017 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java Mon Oct 02 14:20:23 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,22 +25,21 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.internal.xsom.impl.parser.state; + +import com.sun.xml.internal.bind.WhiteSpaceProcessor; +import com.sun.xml.internal.xsom.*; +import com.sun.xml.internal.xsom.impl.*; +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; +import com.sun.xml.internal.xsom.parser.*; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.StringTokenizer; + +import org.xml.sax.Attributes; +import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.Attributes; -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx; - - import com.sun.xml.internal.xsom.*; - import com.sun.xml.internal.xsom.parser.*; - import com.sun.xml.internal.xsom.impl.*; - import com.sun.xml.internal.xsom.impl.parser.*; - import org.xml.sax.Locator; - import org.xml.sax.ContentHandler; - import org.xml.sax.helpers.*; - import java.util.*; - import java.math.BigInteger; - - class simpleType extends NGCCHandler { private AnnotationImpl annotation; @@ -373,7 +372,7 @@ switch($_ngcc_current_state) { case 13: { - name = $value; + name = WhiteSpaceProcessor.collapse($value); $_ngcc_current_state = 12; } break;