--- old/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	2016-08-25 15:12:06.467862914 +0300
+++ new/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	2016-08-25 15:12:06.367861098 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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,20 +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 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;
+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;
 
 
 
@@ -458,14 +454,16 @@
             break;
         case 11:
             {
-                name = $value;
+                // <xs:attribute> with attribute 'name' = $value
+                name = WhiteSpaceProcessor.collapse($value);
                 $_ngcc_current_state = 10;
             }
             break;
         case 5:
             {
+                // <xs:attribute> with attribute 'type' = $value
                 NGCCHandler h = new qname(this, super._source, $runtime, 381);
-                spawnChildFromText(h, $value);
+                spawnChildFromText(h, WhiteSpaceProcessor.collapse($value));
             }
             break;
         }