Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
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
openSource
spring-cloud-netflix
Commits
472b9d17
Commit
472b9d17
authored
Mar 02, 2016
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't run PreDecorationFilter if serviceId already set.
fixes gh-695
parent
8a2a608a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
PreDecorationFilter.java
...k/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java
+2
-1
PreDecorationFilterTests.java
...ud/netflix/zuul/filters/pre/PreDecorationFilterTests.java
+12
-0
No files found.
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java
View file @
472b9d17
...
@@ -58,7 +58,8 @@ public class PreDecorationFilter extends ZuulFilter {
...
@@ -58,7 +58,8 @@ public class PreDecorationFilter extends ZuulFilter {
@Override
@Override
public
boolean
shouldFilter
()
{
public
boolean
shouldFilter
()
{
RequestContext
ctx
=
RequestContext
.
getCurrentContext
();
RequestContext
ctx
=
RequestContext
.
getCurrentContext
();
return
!
ctx
.
containsKey
(
"forward.to"
);
return
!
ctx
.
containsKey
(
"forward.to"
)
// another filter has already forwarded
&&
!
ctx
.
containsKey
(
"serviceId"
);
// another filter has already determined serviceId
}
}
@Override
@Override
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilterTests.java
View file @
472b9d17
...
@@ -69,6 +69,18 @@ public class PreDecorationFilterTests {
...
@@ -69,6 +69,18 @@ public class PreDecorationFilterTests {
}
}
@Test
@Test
public
void
skippedIfServiceIdSet
()
throws
Exception
{
RequestContext
.
getCurrentContext
().
set
(
"serviceId"
,
"myservice"
);
assertEquals
(
false
,
this
.
filter
.
shouldFilter
());
}
@Test
public
void
skippedIfForwardToSet
()
throws
Exception
{
RequestContext
.
getCurrentContext
().
set
(
"forward.to"
,
"mycontext"
);
assertEquals
(
false
,
this
.
filter
.
shouldFilter
());
}
@Test
public
void
prefixRouteAddsHeader
()
throws
Exception
{
public
void
prefixRouteAddsHeader
()
throws
Exception
{
this
.
properties
.
setPrefix
(
"/api"
);
this
.
properties
.
setPrefix
(
"/api"
);
this
.
properties
.
setStripPrefix
(
true
);
this
.
properties
.
setStripPrefix
(
true
);
...
...
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