From c6b0d85a7c1fa28ce46bcc7c87ab6c0afaeb276f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 25 Jan 2018 19:06:20 +0100 Subject: [PATCH] Consistent available() support in DelegatingServletInputStream Issue: SPR-16416 --- .../mock/web/DelegatingServletInputStream.java | 12 ++++++------ .../mock/web/test/DelegatingServletInputStream.java | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java index 42f2073b8f..9c3c31afe9 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java +++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,6 +66,11 @@ public class DelegatingServletInputStream extends ServletInputStream { return data; } + @Override + public int available() throws IOException { + return this.sourceStream.available(); + } + @Override public void close() throws IOException { super.close(); @@ -87,9 +92,4 @@ public class DelegatingServletInputStream extends ServletInputStream { throw new UnsupportedOperationException(); } - @Override - public int available() throws IOException { - return this.sourceStream.available(); - } - } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java index d5e0c40eb7..4a6c608a15 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,6 +66,11 @@ public class DelegatingServletInputStream extends ServletInputStream { return data; } + @Override + public int available() throws IOException { + return this.sourceStream.available(); + } + @Override public void close() throws IOException { super.close();