Browse Source

Consistent available() support in DelegatingServletInputStream

Issue: SPR-16416
pull/1653/head
Juergen Hoeller 8 years ago
parent
commit
c6b0d85a7c
  1. 12
      spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
  2. 7
      spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java

12
spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -87,9 +92,4 @@ public class DelegatingServletInputStream extends ServletInputStream {
throw new UnsupportedOperationException();
}
@Override
public int available() throws IOException {
return this.sourceStream.available();
}
}

7
spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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();

Loading…
Cancel
Save