From afd0ce81e1b1243b6f8bb21e651adcd3641e9a26 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 14 Jan 2008 10:33:44 +0000
Subject: [PATCH] bugfix: when new attribute is added to the principal in
Crowd, openBIS should ignore it, not fail.
SVN: 3506
---
.../crowd/SOAPAttributeContentHandler.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java b/authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java
index 8ce9a2cb9e2..adfcea17970 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/crowd/SOAPAttributeContentHandler.java
@@ -45,10 +45,10 @@ final class SOAPAttributeContentHandler extends DefaultHandler
{
soapAttributeName, soapAttributeValues;
}
-
+
/** Whether we entered the <code>SOAPAttribute</code>. */
private boolean inSoapAttribute;
-
+
/** The current <code>SOAPAttribute</code> child. */
private Child currentChild;
@@ -117,13 +117,17 @@ final class SOAPAttributeContentHandler extends DefaultHandler
name = CrowdSoapElements.SOAPAttribute.valueOf(string);
} catch (IllegalArgumentException ex)
{
- throw new SAXException("Given '" + string + "' is not an allowed text value for the SOAPAttribute name child.");
+ soapAttribute = null; // we skip unknown attributes
+ return;
}
soapAttributes.put(name, NULL);
soapAttribute = name;
} else if (currentChild == Child.soapAttributeValues)
{
- soapAttributes.put(soapAttribute, string);
+ if (soapAttribute != null)
+ {
+ soapAttributes.put(soapAttribute, string);
+ }
}
}
}
--
GitLab