From 1e6f2e79b9e0162f8a111acbe7f2876d0d8eeebe Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 26 Nov 2013 01:41:54 +0100 Subject: [PATCH] Adapted getXmlAsSource implementation to avoid compilation failure in IntelliJ IDEA --- .../jdbc/support/xml/Jdbc4SqlXmlHandler.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java index 0234cf59b25..247e5368146 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,15 +23,15 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLXML; - import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.springframework.dao.DataAccessResourceFailureException; import org.w3c.dom.Document; +import org.springframework.dao.DataAccessResourceFailureException; + /** * Default implementation of the {@link SqlXmlHandler} interface. * Provides database-specific implementations for storing and @@ -83,12 +83,14 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { @Override public Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException { - return rs.getSQLXML(columnName).getSource(sourceClass != null ? sourceClass : DOMSource.class); + SQLXML xmlObject = rs.getSQLXML(columnName); + return (sourceClass != null ? xmlObject.getSource(sourceClass) : xmlObject.getSource(DOMSource.class)); } @Override public Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException { - return rs.getSQLXML(columnIndex).getSource(sourceClass != null ? sourceClass : DOMSource.class); + SQLXML xmlObject = rs.getSQLXML(columnIndex); + return (sourceClass != null ? xmlObject.getSource(sourceClass) : xmlObject.getSource(DOMSource.class)); }