From fab316995ad3e3ecb6a447459659856de2346295 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Wed, 18 Feb 2009 15:48:43 +0000
Subject: [PATCH] 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.

---
 src/helma/objectmodel/db/DbMapping.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/helma/objectmodel/db/DbMapping.java b/src/helma/objectmodel/db/DbMapping.java
index c97ba3d1..ea9de43a 100644
--- a/src/helma/objectmodel/db/DbMapping.java
+++ b/src/helma/objectmodel/db/DbMapping.java
@@ -484,7 +484,7 @@ public final class DbMapping {
      */
     public DbSource getDbSource() {
         if (dbSource == null) {
-            if ((tableName != null) && (dbSourceName != null)) {
+            if (dbSourceName != null) {
                 dbSource = app.getDbSource(dbSourceName);
             } else if (parentMapping != null) {
                 return parentMapping.getDbSource();
@@ -1385,7 +1385,7 @@ public final class DbMapping {
         if (inheritsStorage()) {
             return parentMapping.getStorageTypeName();
         }
-        return (dbSourceName == null) ? null : typename;
+        return (getDbSourceName() == null) ? null : typename;
     }
 
     /**