summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-07-11 15:18:31 +0200
committerGitHub <noreply@github.com>2017-07-11 15:18:31 +0200
commit2ceac3d88f57d218ced860eec76d60dd9d05fb99 (patch)
tree16f449093cf8c01a607935b37bc9ca4a6f31ff73 /application
parent85bedfb90aea80cac81d634e6d664d2317130087 (diff)
parent4562ad75135c62327a8ef03a11f458097c60419d (diff)
Merge pull request #2941 from yahoo/bjorncs/scala-stuff
Bjorncs/scala stuff
Diffstat (limited to 'application')
-rw-r--r--application/src/main/java/com/yahoo/application/container/handler/Headers.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Headers.java b/application/src/main/java/com/yahoo/application/container/handler/Headers.java
index 3b5a62471ac..8c49d36c078 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Headers.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Headers.java
@@ -79,7 +79,7 @@ public class Headers implements Map<String, List<String>> {
}
@Override
- public Set<Entry<String, List<String>>> entrySet() {
+ public Set<Map.Entry<String, List<String>>> entrySet() {
return h.entrySet();
}