SWS-1036 - Make SimpleXsdSchema's toString more resilient

Author: gregturn

spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java

@@ -43,6 +43,7 @@
  *
  * @author Mark LaFond
  * @author Arjen Poutsma
+ * @author Greg Turnquist
  * @since 1.5.0
  */
 public class SimpleXsdSchema implements XsdSchema, InitializingBean {
@@ -91,6 +92,9 @@ public void setXsd(Resource xsdResource) {
 
 	@Override
 	public String getTargetNamespace() {
+
+		Assert.notNull(schemaElement, "schemaElement must not be null! Did you run afterPropertiesSet() or register this as a Spring bean?");
+		
 		return schemaElement.getAttribute("targetNamespace");
 	}
 

spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java

@@ -16,6 +16,8 @@
 
 package org.springframework.xml.xsd;
 
+import org.junit.Test;
+
 import org.springframework.core.io.Resource;
 
 public class SimpleXsdSchemaTest extends AbstractXsdSchemaTestCase {
@@ -27,4 +29,11 @@ protected XsdSchema createSchema(Resource resource) throws Exception {
 		return schema;
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testBareXsdSchema() {
+
+		SimpleXsdSchema schema = new SimpleXsdSchema();
+		schema.toString();
+	}
+
 }