=str #19072 fix FlattenMerge init race

This commit is contained in:
Roland Kuhn 2015-12-09 09:15:24 +01:00
parent 108688de99
commit e3eec6dec8
2 changed files with 63 additions and 22 deletions

View file

@ -190,7 +190,8 @@ public abstract class MediaTypes {
public static MediaType custom(String value, boolean binary, boolean compressible) {
akka.http.scaladsl.model.MediaType.Compressibility comp = compressible ?
akka.http.scaladsl.model.MediaType.Compressible$.MODULE$ : akka.http.scaladsl.model.MediaType.NotCompressible$.MODULE$;
return akka.http.scaladsl.model.MediaType.custom(value, binary, comp , List.<String>empty());
return akka.http.scaladsl.model.MediaType.custom(value, binary, comp ,
akka.http.scaladsl.model.MediaType.custom$default$4());
}
/**