Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made "getJaxbContext()" method public

Browse Source 
Issue: SPR-10282
This commit is contained in:
Juergen Hoeller
2013-02-27 00:26:27 +01:00
parent 3b60f64d51
commit de069d06d8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
View File

@@ -417,7 +417,10 @@ public class Jaxb2Marshaller
}
}
protected JAXBContext getJaxbContext() {
/**
* Return the JAXBContext used by this marshaller, lazily building it if necessary.
*/
public JAXBContext getJaxbContext() {
if (this.jaxbContext != null) {
return this.jaxbContext;
}
@@ -525,10 +528,8 @@ public class Jaxb2Marshaller
public boolean supports(Class<?> clazz) {
if (this.supportJaxbElementClass && JAXBElement.class.isAssignableFrom(clazz)) {
return true;
}
return supportsInternal(clazz, this.checkForXmlRootElement);
return ((this.supportJaxbElementClass && JAXBElement.class.isAssignableFrom(clazz)) ||
supportsInternal(clazz, this.checkForXmlRootElement));
}
public boolean supports(Type genericType) {