...

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -356,7 +356,7 @@ public void close() throws IOException
         if (!_closed) {
             _closed = true;
             try {
-                if (_ioContext.isResourceManaged() || isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE)) {
+                if (_ioContext.isResourceManaged() || isEnabled(StreamReadFeature.AUTO_CLOSE_SOURCE)) {
                     _xmlTokens.closeCompletely();
                 } else {
                     _xmlTokens.close();

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/ToXmlGenerator.java

@@ -1028,7 +1028,7 @@ public void writeNumber(BigDecimal dec) throws IOException
         if (_nextName == null) {
             handleMissingName();
         }
-        boolean usePlain = isEnabled(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN);
+        boolean usePlain = isEnabled(StreamWriteFeature.WRITE_BIGDECIMAL_AS_PLAIN);
         try {
             if (_nextIsAttribute) {
                 if (usePlain) {
@@ -1126,7 +1126,7 @@ protected final void _verifyValueWrite(String typeMsg) throws IOException
     @Override
     public void flush() throws IOException
     {
-        if (isEnabled(JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM)) {
+        if (isEnabled(StreamWriteFeature.FLUSH_PASSED_TO_STREAM)) {
             try {
                 _xmlWriter.flush();
             } catch (XMLStreamException e) {
@@ -1142,15 +1142,10 @@ public void close() throws IOException
         super.close();
 
         // First: let's see that we still have buffers...
-        if (isEnabled(JsonGenerator.Feature.AUTO_CLOSE_CONTENT)) {
+        if (isEnabled(StreamWriteFeature.AUTO_CLOSE_CONTENT)) {
             try {
                 while (true) {
-		    /* 28-May-2016, tatu: To work around incompatibility introduced by
-		     *     `jackson-core` 2.8 where return type of `getOutputContext()`
-		     *     changed, let's do direct access here.
-		     */
-//                    JsonStreamContext ctxt = getOutputContext();
-		    TokenStreamContext ctxt = _outputContext;
+                    TokenStreamContext ctxt = getOutputContext();
                     if (ctxt.inArray()) {
                         writeEndArray();
                     } else if (ctxt.inObject()) {
@@ -1160,14 +1155,13 @@ public void close() throws IOException
                     }
                 }
             } catch (ArrayIndexOutOfBoundsException e) {
-                /* 29-Nov-2010, tatu: Stupid, stupid SJSXP doesn't do array checks, so we get
-                 *   hit by this as a collateral problem in some cases. Yuck.
-                 */
+                // 29-Nov-2010, tatu: Stupid, stupid SJSXP doesn't do array checks, so we get
+                //   hit by this as a collateral problem in some cases. Yuck.
                 throw new JsonGenerationException(e, this);
             }
         }
         try {
-            if (_ioContext.isResourceManaged() || isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET)) {
+            if (_ioContext.isResourceManaged() || isEnabled(StreamWriteFeature.AUTO_CLOSE_TARGET)) {
                 _xmlWriter.closeCompletely();
             } else {
                 _xmlWriter.close();