[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan 13 17:39:21 2012
New Revision: 200

URL: http://svn.shibboleth.net/view/utilities?rev=200&view=rev
Log:
Handle oddness in the xml:space definitions without throwing exceptions

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java?rev=200&r1=199&r2=200&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/AttributeSupport.java Fri Jan 13 17:39:21 2012
@@ -463,7 +463,20 @@
      * @return the value of the xml:space attribute, or null if not present
      */
     @Nullable public static XmlSpace getXMLSpace(@Nullable final Element element) {
-        return XmlSpace.parseValue(getAttributeValue(element, XmlConstants.XML_SPACE_ATTRIB_NAME));
+        if (null == element) {
+            return null;
+        }
+        String value = getAttributeValue(element, XmlConstants.XML_SPACE_ATTRIB_NAME);
+        if (null == value) {
+            return null;
+        }
+        try { 
+            return XmlSpace.parseValue(value);
+        }
+        catch (IllegalArgumentException e) {
+            // No match to the type
+            return null;
+        }
     }
 
     /**