Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 76ca92b1f -> 0300a5eb3
Fixing a compilation issue on 2.7.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0300a5eb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0300a5eb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0300a5eb Branch: refs/heads/2.7.x-fixes Commit: 0300a5eb33c434f4b682168933156b1c7768ed89 Parents: 76ca92b Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Wed Jan 28 17:40:15 2015 +0000 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Wed Jan 28 17:40:15 2015 +0000 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0300a5eb/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java index c1c7237..c16fc18 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java @@ -47,7 +47,6 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; -import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.apache.abdera.Abdera; @@ -669,12 +668,8 @@ public class AtomPojoProvider extends AbstractConfigurableProvider } catch (Exception ex) { reportError("Object of type " + cls.getName() + " can not be deserialized from Entry", ex, 400); } finally { - try { - if (xreader != null) { - StaxUtils.close(xreader); - } - } catch (XMLStreamException e) { - //ignore + if (xreader != null) { + StaxUtils.close(xreader); } } }
