svn commit: r1460840 - /cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java

[dkulp]

Author: dkulp
Date: Mon Mar 25 18:47:14 2013
New Revision: 1460840

URL: http://svn.apache.org/r1460840
Log:
Missed a merge conflict

Modified:
    
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java

Modified: 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=1460840&r1=1460839&r2=1460840&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
 Mon Mar 25 18:47:14 2013
@@ -108,18 +108,13 @@ public class StaxInInterceptor extends A
                     reader = factory.createXMLStreamReader(is, encoding);
                 }                
             }
-            xreader = configureRestrictions(xreader, message);
+            reader = configureRestrictions(reader, message);
         } catch (XMLStreamException e) {
             throw new Fault(new 
org.apache.cxf.common.i18n.Message("STREAM_CREATE_EXC",
                                                                    LOG,
                                                                    encoding), 
e);
         }
-<<<<<<< 
HEAD:rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
-
         message.setContent(XMLStreamReader.class, reader);
-=======
-        message.setContent(XMLStreamReader.class, xreader);
->>>>>>> bca2740... Merged revisions 1460788 via  git cherry-pick 
from:api/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
         message.getInterceptorChain().add(StaxInEndingInterceptor.INSTANCE);
     }