Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-07-23 02:53:13 -0400
committerGreg Wilkins2014-07-23 02:53:13 -0400
commitfa3d7d0f7e02dee5285decb7786ab2575875ec84 (patch)
tree4779123b752197d888e3e5c0cbbc2ce5cde732e5 /jetty-security/src/main/java/org/eclipse
parentecb3ab7e5bab9cad1338708c184d127c00a1bff5 (diff)
parent3a6879d3e8efb895bf27803735785428f7ed3659 (diff)
downloadorg.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.tar.gz
org.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.tar.xz
org.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.zip
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts: jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
Diffstat (limited to 'jetty-security/src/main/java/org/eclipse')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java40
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java8
2 files changed, 24 insertions, 24 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
index df0f7d92f3..fe4c64b8bb 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
@@ -331,28 +331,28 @@ public class DeferredAuthentication implements Authentication.Deferred
}
@Override
- public Collection<String> getHeaderNames()
- {
- return Collections.emptyList();
- }
-
- @Override
- public String getHeader(String arg0)
- {
- return null;
- }
-
- @Override
- public Collection<String> getHeaders(String arg0)
- {
+ public Collection<String> getHeaderNames()
+ {
return Collections.emptyList();
- }
+ }
+
+ @Override
+ public String getHeader(String arg0)
+ {
+ return null;
+ }
- @Override
- public int getStatus()
- {
- return 0;
- }
+ @Override
+ public Collection<String> getHeaders(String arg0)
+ {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public int getStatus()
+ {
+ return 0;
+ }
};
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
index 8469c0a800..e0248b2e59 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
@@ -50,7 +50,7 @@ public class SpnegoAuthenticator extends LoginAuthenticator
*/
public SpnegoAuthenticator( String authMethod )
{
- _authMethod = authMethod;
+ _authMethod = authMethod;
}
@Override
@@ -77,10 +77,10 @@ public class SpnegoAuthenticator extends LoginAuthenticator
{
try
{
- if (DeferredAuthentication.isDeferred(res))
- {
+ if (DeferredAuthentication.isDeferred(res))
+ {
return Authentication.UNAUTHENTICATED;
- }
+ }
LOG.debug("SpengoAuthenticator: sending challenge");
res.setHeader(HttpHeader.WWW_AUTHENTICATE.asString(), HttpHeader.NEGOTIATE.asString());

Back to the top