Fixed a problem with matching function boolean logic.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@386 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ExactSharMatchFunction.java b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ExactSharMatchFunction.java
index cfffb4a..a3f89cf 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ExactSharMatchFunction.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ExactSharMatchFunction.java
@@ -68,7 +68,7 @@ public class ExactSharMatchFunction implements MatchFunction {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {

-               if (!(arpComponent instanceof String) && !(requestComponent instanceof String)) {
+               if (!(arpComponent instanceof String) || !(requestComponent instanceof String)) {

                        log.error("Invalid use of ARP matching function (ExacthSharMatchFunction).");
                        throw new MatchingException("Invalid use of ARP matching function (ExacthSharMatchFunction).");
                }
                        log.error("Invalid use of ARP matching function (ExacthSharMatchFunction).");
                        throw new MatchingException("Invalid use of ARP matching function (ExacthSharMatchFunction).");
                }

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/RegexMatchFunction.java b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/RegexMatchFunction.java
index 8de03d1..b586a6c 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/RegexMatchFunction.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/RegexMatchFunction.java
@@ -72,7 +72,7 @@ public class RegexMatchFunction implements MatchFunction {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {

-               if (!(arpComponent instanceof String) && !(requestComponent instanceof String || requestComponent instanceof URL)) {
+               if (!(arpComponent instanceof String) || !(requestComponent instanceof String || requestComponent instanceof URL)) {

                        log.error("Invalid use of ARP matching function (RegexMatchFunction).");
                        throw new MatchingException(
                                "Invalid use of ARP matching function (RegexMatchFunction).");
                        log.error("Invalid use of ARP matching function (RegexMatchFunction).");
                        throw new MatchingException(
                                "Invalid use of ARP matching function (RegexMatchFunction).");

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ResourceTreeMatchFunction.java b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ResourceTreeMatchFunction.java
index ef9ea9a..ece33c1 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ResourceTreeMatchFunction.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/provider/ResourceTreeMatchFunction.java
@@ -72,7 +72,7 @@ public class ResourceTreeMatchFunction implements MatchFunction {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {
        public boolean match(Object arpComponent, Object requestComponent)
                throws MatchingException
        {

-               if (!(arpComponent instanceof String) && !(requestComponent instanceof URL)) {
+               if (!(arpComponent instanceof String) || !(requestComponent instanceof URL)) {

                        log.error("Invalid use of ARP matching function (ResourceTreeMatchFunction).");
                        throw new MatchingException(
                                "Invalid use of ARP matching function (ResourceTreeMatchFunction).");
                        log.error("Invalid use of ARP matching function (ResourceTreeMatchFunction).");
                        throw new MatchingException(
                                "Invalid use of ARP matching function (ResourceTreeMatchFunction).");