From 3975d1170a0694c9694a538b44c8f4ebbc90a6b3 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 17 Jul 2014 18:21:22 +1000
Subject: 439753 ConstraintSecurityHandler has dead code for processing
 constraints

---
 .../eclipse/jetty/security/ConstraintSecurityHandler.java | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'jetty-security/src/main/java/org/eclipse')

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);
-                    }
-                }
-            }
-        }
     }
 
     /* ------------------------------------------------------------ */
-- 
cgit v1.2.3


From 405fd05a6e330d90e3e1349ae1e853be703afe44 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 17 Jul 2014 18:36:35 +1000
Subject: 439369 Deprecate CrossContextPseudoSession

---
 .../java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java  | 3 +++
 .../java/org/eclipse/jetty/security/CrossContextPsuedoSession.java     | 1 +
 .../java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java | 1 +
 3 files changed, 5 insertions(+)

(limited to 'jetty-security/src/main/java/org/eclipse')

diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java
index fbe2b62b95..9215eddaf0 100644
--- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java
+++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java
@@ -92,6 +92,9 @@ public class FormAuthModule extends BaseAuthModule
         setErrorPage(errorPage);
     }
 
+    /**
+     * @deprecated
+     */
     public FormAuthModule(CallbackHandler callbackHandler, CrossContextPsuedoSession<UserInfo> ssoSource, 
                           String loginPage, String errorPage)
     {
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>
 {
-- 
cgit v1.2.3