Merge branch 'master' of github.com:ebean-orm/avaje-ebeanorm

This commit is contained in:
Robin Bygrave
2016-04-12 23:21:32 +12:00
@@ -222,7 +222,7 @@ public class DefaultContainer implements SpiContainer {
List<Class<?>> entityClasses = serverConfig.getClasses();
if (serverConfig.isDisableClasspathSearch() || (entityClasses != null && entityClasses.size() > 0)) {
// use classes we explicitly added via configuration
return new BootupClasses(serverConfig.getClasses());
return new BootupClasses(entityClasses);
}
return BootupClassPathSearch.search(serverConfig);