Fix compile time generics error

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

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index e97027c..71922f3 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -95,7 +95,8 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
         }
         super.populateMessageDecoder(decoder);
 
-        decoder.setRequest(requestContext.getProfileRequest().getRawRequest());
+        ProfileRequest<ServletRequest> profileRequest = requestContext.getProfileRequest();
+        decoder.setRequest(profileRequest.getRawRequest());
         requestContext.setMessageDecoder(decoder);
 
         try {
@@ -167,7 +168,8 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
         }
 
         super.populateMessageEncoder(encoder);
-        encoder.setResponse(requestContext.getProfileResponse().getRawResponse());
+        ProfileResponse<ServletResponse> profileResponse = requestContext.getProfileResponse();
+        encoder.setResponse(profileResponse.getRawResponse());
         encoder.setSamlMessage(requestContext.getSamlResponse());
         requestContext.setMessageEncoder(encoder);
 

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
index 1f1b10f..7cf9e45 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
@@ -336,7 +336,8 @@ public class ShibbolethSSOProfileHandler extends AbstractSAML1ProfileHandler {
         }
 
         super.populateMessageEncoder(encoder);
-        encoder.setResponse(requestContext.getProfileResponse().getRawResponse());
+        ProfileResponse<ServletResponse> profileResponse = requestContext.getProfileResponse(); 
+        encoder.setResponse(profileResponse.getRawResponse());
         encoder.setSamlMessage(requestContext.getSamlResponse());
         requestContext.setMessageEncoder(encoder);
 

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index 8e85a30..78188f6 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -109,7 +109,8 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
         }
         super.populateMessageDecoder(decoder);
 
-        decoder.setRequest(requestContext.getProfileRequest().getRawRequest());
+        ProfileRequest<ServletRequest> profileRequest = requestContext.getProfileRequest(); 
+        decoder.setRequest(profileRequest.getRawRequest());
         requestContext.setMessageDecoder(decoder);
 
         try {
@@ -180,7 +181,8 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
         }
 
         super.populateMessageEncoder(encoder);
-        encoder.setResponse(requestContext.getProfileResponse().getRawResponse());
+        ProfileResponse<ServletResponse> profileResponse = requestContext.getProfileResponse();
+        encoder.setResponse(profileResponse.getRawResponse());
         encoder.setSamlMessage(requestContext.getSamlResponse());
         requestContext.setMessageEncoder(encoder);
 

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index 32c0db1..b9a339f 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -460,7 +460,8 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
         encoder.setRelyingParty(requestContext.getRelyingPartyMetadata());
         encoder.setRelyingPartyEndpoint(relyingPartyEndpoint);
         encoder.setRelyingPartyRole(requestContext.getRelyingPartyRoleMetadata());
-        encoder.setResponse(requestContext.getProfileResponse().getRawResponse());
+        ProfileResponse<ServletResponse> profileResponse = requestContext.getProfileResponse(); 
+        encoder.setResponse(profileResponse.getRawResponse());
         encoder.setSamlMessage(requestContext.getSamlResponse());
         requestContext.setMessageEncoder(encoder);