svn commit: r1404099 - in /cxf/branches/2.6.x-fixes: ./ rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/ rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/

[sergeyb]

Author: sergeyb
Date: Wed Oct 31 11:32:49 2012
New Revision: 1404099

URL: http://svn.apache.org/viewvc?rev=1404099&view=rev
Log:
Merged revisions 1401604,1404089 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1401604 | sergeyb | 2012-10-24 11:10:29 +0100 (Wed, 24 Oct 2012) | 1 line
  
  Fixing the wrong setting to null in XmlBeansJSONProvider, thanks to Colm
........
  r1404089 | sergeyb | 2012-10-31 11:06:03 +0000 (Wed, 31 Oct 2012) | 1 line
  
  Removing the duplicate code in AtomPushEngineConfigurator, thanks to Colm
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1401604,1404089

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java?rev=1404099&r1=1404098&r2=1404099&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngineConfigurator.java
 Wed Oct 31 11:32:49 2012
@@ -128,11 +128,8 @@ final class AtomPushEngineConfigurator {
                     : batch > 1 ? Multiplicity.MANY : Multiplicity.ONE; 
                 Multiplicity mul = parseEnum(multiplicity, defaultMul, 
Multiplicity.class);
                 Format form = parseEnum(format, Format.CONTENT, Format.class);
-                if (out == Output.FEED) {
-                    c = new StandardConverter(out, mul, form);
-                } else {
-                    c = new StandardConverter(out, mul, form);
-                }
+                c = new StandardConverter(out, mul, form);
+                
                 if (retryPause != null) {
                     int timeout = parseInt(retryTimeout, 0, 0);
                     int pause = parseInt(retryPauseTime, 1, 30);

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java?rev=1404099&r1=1404098&r2=1404099&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/xmlbeans/XMLBeansJSONProvider.java
 Wed Oct 31 11:32:49 2012
@@ -70,7 +70,7 @@ public class XMLBeansJSONProvider extend
             result = parseXmlBean(type, r);
 
             xsr.close();
-            result = null;
+            xsr = null;
 
         } catch (XMLStreamException e) {
             throw new 
WebApplicationException(HttpURLConnection.HTTP_INTERNAL_ERROR);