Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
ed3e1e07
Commit
ed3e1e07
authored
Jun 28, 2019
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix AbstractFilterRegistrationBean merge error
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
parent
bb348466
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
AbstractFilterRegistrationBean.java
...work/boot/web/servlet/AbstractFilterRegistrationBean.java
+1
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View file @
ed3e1e07
...
...
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb
* @since 1.5.22
*/
public
abstract
class
AbstractFilterRegistrationBean
extends
RegistrationBean
{
public
abstract
class
AbstractFilterRegistrationBean
<
T
extends
Filter
>
extends
DynamicRegistrationBean
<
Dynamic
>
{
/**
* Filters that wrap the servlet request should be ordered less than or equal to this.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment