aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/java
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-04-02 12:03:29 +0200
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-04-02 12:03:29 +0200
commit4b890232cc2ef904ede71663abb4fb5f3d8be7e8 (patch)
tree4421b954168090878a0341ee3eba31d7b3906212 /id/server/idserverlib/src/main/java
parent758b9760bc018319eec916103e5e73385c2a4c4b (diff)
parent07e74546f01f69545b77518e0e651b43a4e04e91 (diff)
downloadmoa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.tar.gz
moa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.tar.bz2
moa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into vidp_2.1_bs
Diffstat (limited to 'id/server/idserverlib/src/main/java')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java8
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java4
2 files changed, 9 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
index 6517325b9..11e280d8f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
@@ -122,7 +122,13 @@ public class PostBinding implements IDecoder, IEncoder {
MOARequest request = new MOARequest(inboundMessage);
request.setVerified(false);
- request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+
+ if (messageContext.getPeerEntityMetadata() != null)
+ request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+
+ else
+ Logger.info("No Metadata found for OA with EntityID " + inboundMessage.getIssuer().getValue());
+
request.setRelayState(messageContext.getRelayState());
return request;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 0cb11cf5f..5eb55317a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -232,8 +232,8 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
return true;
}
else {
- Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");
- Logger.error("Ueberpruefte bkuURI: " + bkuURI);
+ Logger.error("Fehler Ueberpruefung Parameter bkuURI. "
+ + bkuURI + " ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");
return false;
}
}