Merge bug/REL1_6_STABLE/issue481 into REL1_6_STABLE

Merges PR #482.

pljava/src/main/java/org/postgresql/pljava/jdbc/SQLXMLImpl.java

@@ -3933,6 +3933,10 @@ static void saxCopy(SAXSource sxs, SAXResult sxr) throws SQLException
 						SAX2PROPERTY.LEXICAL_HANDLER.propertyUri(), lh);
 				xr.parse(sxs.getInputSource());
 			}
+			/*
+			 * If changing these wrapping conventions, change them also in
+			 * AdjustingDOMSource.get()
+			 */
 			catch ( SAXException e )
 			{
 				throw new SQLDataException(e.getMessage(), "22000", e);
@@ -5555,10 +5559,21 @@ public DOMSource get() throws SQLException
 			}
 
 			Exception e = exceptions();
-			if ( null != e )
-				throw normalizedException(e);
 
-			return ds;
+			if ( null == e )
+				return ds;
+
+			/*
+			 * If changing these wrapping conventions, change them also in
+			 * XMLCopier.saxCopy()
+			 */
+			if ( e instanceof SAXException )
+				throw new SQLDataException(e.getMessage(), "22000", e);
+
+			if ( e instanceof IOException )
+				throw new SQLException(e.getMessage(), "58030", e);
+
+			throw normalizedException(e);
 		}
 
 		@Override