Skip to content

Commit cf0f5b0

Browse files
committed
fix NoneEncoder instance reference
1 parent 074b9fe commit cf0f5b0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

grails-encoder/src/main/groovy/org/codehaus/groovy/grails/plugins/codecs/BasicCodecLookup.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
import org.codehaus.groovy.grails.support.encoding.CodecLookup;
2828
import org.codehaus.groovy.grails.support.encoding.Decoder;
2929
import org.codehaus.groovy.grails.support.encoding.Encoder;
30+
import org.codehaus.groovy.grails.support.encoding.StreamingEncoder;
3031
import org.springframework.beans.factory.InitializingBean;
3132

3233
public class BasicCodecLookup implements CodecLookup, InitializingBean {
3334
private static final String NONE_CODEC_NAME = "none";
3435
protected Map<String, Encoder> encoders;
3536
protected Map<String, Decoder> decoders;
36-
public static final Encoder NONE_ENCODER = new NoneEncoder();
37+
public static final StreamingEncoder NONE_ENCODER = new NoneEncoder();
3738

3839
public BasicCodecLookup() {
3940
super();

grails-encoder/src/main/groovy/org/codehaus/groovy/grails/support/encoding/DefaultEncodingStateRegistry.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.Map;
2222
import java.util.Set;
2323

24+
import org.codehaus.groovy.grails.plugins.codecs.BasicCodecLookup;
25+
2426
/**
2527
* default implementation of {@link EncodingStateRegistry}
2628
*
@@ -29,7 +31,7 @@
2931
*/
3032
public final class DefaultEncodingStateRegistry implements EncodingStateRegistry {
3133
private Map<Encoder, Set<Integer>> encodingTagIdentityHashCodes = new HashMap<Encoder, Set<Integer>>();
32-
public static Encoder NONE_ENCODER;
34+
public static final StreamingEncoder NONE_ENCODER = BasicCodecLookup.NONE_ENCODER;
3335

3436
private Set<Integer> getIdentityHashCodesForEncoder(Encoder encoder) {
3537
Set<Integer> identityHashCodes = encodingTagIdentityHashCodes.get(encoder);

0 commit comments

Comments
 (0)