Skip to content

Commit bfd3d00

Browse files
committed
catch up act-ebean-1.6.4 change
1 parent d0055ba commit bfd3d00

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# act-ebean-java7 CHANGE LOG
22

3+
1.6.1 - 14/May/2018
4+
* java.lang.ClassCastException: java.lang.String cannot be cast to [C #22
5+
36
1.6.0 - 13/May/2018
47
* update act to 1.8.8-RC4
58
* Disable Ebean classpath search #21

src/main/java/act/db/ebean/EbeanService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public final class EbeanService extends SqlDbService {
6161
public EbeanService(final String dbId, final App app, final Map<String, String> config) {
6262
super(dbId, app, config);
6363
String s = config.get("agentPackage");
64-
final String agentPackage = null == s ? S.string(app().config().get(AppConfigKey.SCAN_PACKAGE, null)) : S.string(s).trim();
64+
String scanPackage = app().config().get(AppConfigKey.SCAN_PACKAGE, null);
65+
final String agentPackage = null == s ? scanPackage : S.string(s).trim();
6566
E.invalidConfigurationIf(S.blank(agentPackage), "\"agentPackage\" not configured");
6667
if (isTraceEnabled()) {
6768
trace("\"agentPackage\" configured: %s", agentPackage);

0 commit comments

Comments
 (0)