master
Juergen Hoeller 16 years ago
parent a3af9e7330
commit e70d2ce14c
  1. 3
      org.springframework.orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
  2. 6
      org.springframework.web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java

@ -543,8 +543,7 @@ public class PersistenceAnnotationBeanPostProcessor extends JndiLocatorSupport
PersistenceProperty[] pps = pc.properties();
if (!ObjectUtils.isEmpty(pps)) {
properties = new Properties();
for (int i = 0; i < pps.length; i++) {
PersistenceProperty pp = pps[i];
for (PersistenceProperty pp : pps) {
properties.setProperty(pp.name(), pp.value());
}
}

@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2009 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.
@ -121,8 +121,8 @@ public class XmlWebApplicationContext extends AbstractRefreshableWebApplicationC
protected void loadBeanDefinitions(XmlBeanDefinitionReader reader) throws BeansException, IOException {
String[] configLocations = getConfigLocations();
if (configLocations != null) {
for (int i = 0; i < configLocations.length; i++) {
reader.loadBeanDefinitions(configLocations[i]);
for (String configLocation : configLocations) {
reader.loadBeanDefinitions(configLocation);
}
}
}

Loading…
Cancel
Save