This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-jaxrs-providers.
commit b623f36149d80a4da9e91543aeb59072f490790c Author: Tatu Saloranta <[email protected]> Date: Wed Oct 9 22:16:56 2013 -0700 Refactoring: should not try to modify settings of JsonFactory on per-call basis --- .../java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java | 6 ++++++ .../com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java index 16d5694..a37c510 100644 --- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java +++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java @@ -756,6 +756,12 @@ public abstract class ProviderBase< m = _mapperConfig.getDefaultMapper(); } } + // Important: we are NOT to close the underlying stream after + // mapping, so we need to instruct parser: + JsonFactory f = m.getFactory(); + f.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE); + // ditto for generator + f.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); return m; } diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java index 0dab128..465ca85 100644 --- a/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java +++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/EndpointConfigBase.java @@ -116,11 +116,6 @@ public abstract class EndpointConfigBase<THIS extends EndpointConfigBase<THIS>> if (_deserDisable != null) { _reader = _reader.withoutFeatures(_deserDisable); } - /* Important: we are NOT to close the underlying stream after - * mapping, so we need to instruct parser: - */ - _reader.getFactory().disable(JsonParser.Feature.AUTO_CLOSE_SOURCE); - return (THIS) this; } @@ -155,11 +150,6 @@ public abstract class EndpointConfigBase<THIS extends EndpointConfigBase<THIS>> if (_serDisable != null) { _writer = _writer.withoutFeatures(_serDisable); } - /* Important: we are NOT to close the underlying stream after - * mapping, so we need to instruct parser: - */ - _writer.getFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET); - return (THIS) this; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
