antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Fix bug where storage type name is null when a extended prototype inherits the _db but has its own _table. Allow extended prototypes to only override the _db, but not the _table.

Browse source
This commit is contained in:
hns 2009-02-18 15:48:43 +00:00
parent 7044354843
commit fab316995a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helma/objectmodel/db/DbMapping.java
View file

@ -484,7 +484,7 @@ public final class DbMapping {
*/ */
public DbSource getDbSource() { public DbSource getDbSource() {
if (dbSource == null) { if (dbSource == null) {
if ((tableName != null) && (dbSourceName != null)) { if (dbSourceName != null) {
dbSource = app.getDbSource(dbSourceName); dbSource = app.getDbSource(dbSourceName);
} else if (parentMapping != null) { } else if (parentMapping != null) {
return parentMapping.getDbSource(); return parentMapping.getDbSource();
@ -1385,7 +1385,7 @@ public final class DbMapping {
if (inheritsStorage()) { if (inheritsStorage()) {
return parentMapping.getStorageTypeName(); return parentMapping.getStorageTypeName();
} }
return (dbSourceName == null) ? null : typename; return (getDbSourceName() == null) ? null : typename;
} }
/** /**