Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-07-18 01:28:54 -0400
committerGreg Wilkins2014-07-18 01:28:54 -0400
commita537fefd6ba8f7666e849b3d4cc5d433a87f57b1 (patch)
tree0d57ccf7d46233a4b49788bb246324b6fad4ada8 /jetty-security/src/main/java/org/eclipse
parent64e5c1e0ce9fa3b0a66e7b4764818b126e3f21ca (diff)
parente9a77b6ac76f10e9caca3cee0d76a443df05ae3d (diff)
downloadorg.eclipse.jetty.project-a537fefd6ba8f7666e849b3d4cc5d433a87f57b1.tar.gz
org.eclipse.jetty.project-a537fefd6ba8f7666e849b3d4cc5d433a87f57b1.tar.xz
org.eclipse.jetty.project-a537fefd6ba8f7666e849b3d4cc5d433a87f57b1.zip
Merge remote-tracking branch 'origin/master' into jetty-http2
Diffstat (limited to 'jetty-security/src/main/java/org/eclipse')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java15
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java1
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java1
3 files changed, 2 insertions, 15 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
index 1bd2d52cd1..7b7f2a395e 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
@@ -511,21 +511,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
mappings.put(ALL_METHODS,roleInfo);
}
}
- else
- {
- //combine with any entry that covers all methods
- if (httpMethod == null)
- {
- for (Map.Entry<String, RoleInfo> entry : mappings.entrySet())
- {
- if (entry.getKey() != null)
- {
- RoleInfo specific = entry.getValue();
- specific.combine(roleInfo);
- }
- }
- }
- }
}
/* ------------------------------------------------------------ */
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java
index e2de9f7db2..a67eb96d6f 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* @version $Rev: 4466 $ $Date: 2009-02-10 23:42:54 +0100 (Tue, 10 Feb 2009) $
+ * @deprecated
*/
public interface CrossContextPsuedoSession<T>
{
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java
index 8499a609d3..2f94908acb 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* @version $Rev: 4660 $ $Date: 2009-02-25 17:29:53 +0100 (Wed, 25 Feb 2009) $
+ * @deprecated
*/
public class HashCrossContextPsuedoSession<T> implements CrossContextPsuedoSession<T>
{

Back to the top