aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-03-06 08:18:18 +0100
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-03-06 08:58:30 +0100
commit257c27091b20e1fbcf7ccce8bfe8b908cb33a62e (patch)
tree81a2ba1dfe00fcbe940c2398088d93a138f2144f /id/server
parent97ac38abf8d7fcea628ed1e7bd343c3d4ea958f9 (diff)
downloadmoa-id-spss-257c27091b20e1fbcf7ccce8bfe8b908cb33a62e.tar.gz
moa-id-spss-257c27091b20e1fbcf7ccce8bfe8b908cb33a62e.tar.bz2
moa-id-spss-257c27091b20e1fbcf7ccce8bfe8b908cb33a62e.zip
fixed error message
Diffstat (limited to 'id/server')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java2
-rw-r--r--id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties1
2 files changed, 2 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
index f660e1b33..409e506af 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -263,7 +263,7 @@ public class AttributeCollector implements IAction {
if(!(existing.isEmptyValue() && existing.isEmptyComplexValue()))
if(!(existing.getValue().equals(current.getValue()) || existing.getComplexValue().equals(current.getComplexValue()))) {
Logger.error("Attribute Value does not match the value from first authentication!");
- throw new MOAIDException("stork.14", null);
+ throw new MOAIDException("stork.16", new Object[] {existing.getName()});
}
target.get(current.getName()).setStatus(current.getStatus());
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index 99d5d7612..f6a296fde 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -210,6 +210,7 @@ stork.12=Konnte keine VIDP Konfiguration finden
stork.13=Fehler beim Sammeln eines Attributes in einem AttributProviderPlugin
stork.14=Es wurde weder Authentifizierungs/ noch Attributerequest empfangen
stork.15=Unbekannte request.
+stork.16=Ein Attribute aus zwei verschiedenen Quellen unterscheidet sich\: {0}
pvp2.00={0} ist kein gueltiger consumer service index
pvp2.01=Fehler beim kodieren der PVP2 Antwort