diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-27 14:52:57 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-27 14:52:57 +0100 |
| commit | ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f (patch) | |
| tree | 6e2b55bb00667e152f96d3486c9015c8cc33991d /id/server/modules/moa-id-module-eIDAS/src/main/java/at | |
| parent | e01b0fee1d650159561071bdb6027039edc2b76d (diff) | |
| parent | c514e19e4915c59f20dd25be1ede953b3d8b02ac (diff) | |
| download | moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.gz moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.bz2 moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.zip | |
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts:
id/server/idserverlib/pom.xml
id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java
id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
Diffstat (limited to 'id/server/modules/moa-id-module-eIDAS/src/main/java/at')
2 files changed, 4 insertions, 4 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java index 5040f1fe3..09287e6d4 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java +++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java @@ -150,7 +150,7 @@ public class AuthenticationRequest implements IAction { Logger.trace("Sending html content : " + new String(writer.getBuffer())); httpResp.getOutputStream().write(writer.getBuffer().toString().getBytes("UTF-8")); - httpResp.setContentType(MediaType.TEXT_HTML_VALUE); + httpResp.setContentType(MediaType.TEXT_HTML.getType()); } catch (Exception e) { Logger.error("Velocity error: " + e.getMessage()); diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java index 31594f515..66179fae4 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java +++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java @@ -62,9 +62,9 @@ public class EidasMetaDataRequest implements IAction { logger.trace(metaData); - httpResp.setContentType(MediaType.TEXT_XML_VALUE); - httpResp.getWriter().print(metaData); - httpResp.flushBuffer(); + response.setContentType(MediaType.TEXT_XML.getType()); + response.getWriter().print(metaData); + response.flushBuffer(); } catch (Exception e) { e.printStackTrace(); } |