Permalink
Browse files

fix for GRAILS-4629

  • Loading branch information...
1 parent 01c6236 commit 141995c72eda65a925fd318e721d864f4f238806 @graemerocher graemerocher committed Jul 21, 2009
@@ -764,7 +764,7 @@ Try using Grails' default cache provider: 'org.hibernate.cache.OSCacheProvider'"
def xmlBeans = new org.springframework.beans.factory.xml.XmlBeanFactory(resourcesXml);
if (xmlBeans.containsBean("dataSource")) {
LOG.info("Using dataSource bean definition from ${GrailsRuntimeConfigurator.SPRING_RESOURCES_XML}")
- return xmlBeans.getBeanDefinition("dataSource");
+ return xmlBeans.getMergedBeanDefinition("dataSource");
}
}
} catch (FileNotFoundException fnfe) {

0 comments on commit 141995c

Please sign in to comment.