--- a/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java	2011-03-30 23:52:37.000000000 +0200
+++ b/utilities/src/main/java/com/sun/xml/fastinfoset/streambuffer/FastInfosetWriterSAXBufferProcessor.java-gil	2012-03-31 14:44:06.180707216 +0200
@@ -71,8 +71,8 @@
     public final void process(FastInfosetWriter writer) throws SAXException {
         _writer = writer;
         
-        final int item = readStructure();
-        switch(_eiiStateTable[item]) {
+        final int item = getEIIState(readStructure());
+        switch(item) {
             case STATE_DOCUMENT:
                 processDocument();
                 break;
@@ -123,8 +123,8 @@
         boolean firstElementHasOccured = false;
         int item;
         do {
-            item = readStructure();
-            switch(_eiiStateTable[item]) {
+            item = getEIIState(readStructure());
+            switch(item) {
                 case STATE_ELEMENT_U_LN_QN:
                     firstElementHasOccured = true;
                     processElement(readStructureString(), readStructureString(), readStructureString());
@@ -186,8 +186,8 @@
         } while(item != T_END || !firstElementHasOccured);
 
         while(item != T_END) {
-            item = readStructure();
-            switch(_eiiStateTable[item]) {
+            item = getEIIState(readStructure());
+            switch(item) {
                 case STATE_COMMENT_AS_CHAR_ARRAY_SMALL:
                 {
                     final int length = readStructure();
@@ -244,7 +244,7 @@
         }
 
         do {
-            item = _eiiStateTable[readStructure()];
+            item = getEIIState(readStructure());
             switch(item) {
                 case STATE_ELEMENT_U_LN_QN:
                     processElement(readStructureString(), readStructureString(), readStructureString());
@@ -365,7 +365,7 @@
     
     private int processNamespaceAttributes(int item) throws SAXException {
         do {
-            switch(_niiStateTable[item]) {
+            switch(getNIIState(item)) {
                 case STATE_NAMESPACE_ATTRIBUTE:
                     // Undeclaration of default namespace
                     processNamespaceAttribute("", "");
@@ -398,7 +398,7 @@
     
     private void processAttributes(int item) throws SAXException {
         do {
-            switch(_aiiStateTable[item]) {
+            switch(getAIIState(item)) {
                 case STATE_ATTRIBUTE_U_LN_QN:
                     _attributes.addAttribute(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString());
                     break;
