Fixed a bug with the default Relying Party implementation. Should still carry the...

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

diff --git a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
index 3bc4173..328638d 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ServiceProviderMapper.java
@@ -88,7 +88,7 @@ public abstract class ServiceProviderMapper {
                //OK, just send the default
                log.info("Could not locate Relying Party configuration for (" + providerIdFromTarget
                                + ").  Using default Relying Party.");
-               return new UnknownProviderWrapper(getDefaultRelyingPatry());
+               return new UnknownProviderWrapper(getDefaultRelyingPatry(), providerIdFromTarget);
        }
 
        private RelyingParty findRelyingPartyByGroup(String providerIdFromTarget) {
@@ -264,9 +264,11 @@ public abstract class ServiceProviderMapper {
        protected class UnknownProviderWrapper implements RelyingParty, HSRelyingParty, AARelyingParty {
 
                protected RelyingParty  wrapped;
+               protected String providerId;
 
-               protected UnknownProviderWrapper(RelyingParty wrapped) {
+               protected UnknownProviderWrapper(RelyingParty wrapped, String providerId) {
                        this.wrapped = wrapped;
+                       this.providerId = providerId;
                }
 
                public String getName() {
@@ -278,7 +280,7 @@ public abstract class ServiceProviderMapper {
                }
 
                public String getProviderId() {
-                       return null;
+                       return providerId;
                }
 
                public String getHSNameFormatId() {

diff --git a/src/edu/internet2/middleware/shibboleth/hs/HSServiceProviderMapper.java b/src/edu/internet2/middleware/shibboleth/hs/HSServiceProviderMapper.java
index c10b13e..7c04595 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/HSServiceProviderMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/HSServiceProviderMapper.java
@@ -253,7 +253,7 @@ public class HSServiceProviderMapper extends ServiceProviderMapper {
        class LegacyWrapper extends UnknownProviderWrapper implements HSRelyingParty {
 
                LegacyWrapper(HSRelyingParty wrapped) {
-                       super(wrapped);
+                       super(wrapped, null);
                }
 
                public boolean isLegacyProvider() {