[MMBASE SCM] r38544 - mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database

[michiel]

Author: michiel
Date: 2009-09-10 01:02:45 +0200 (Thu, 10 Sep 2009)
New Revision: 38544

Modified:
   
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/ViewDatabaseStorageManager.java
Log:
added some assertions

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/ViewDatabaseStorageManager.java
===================================================================
--- 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/ViewDatabaseStorageManager.java
  2009-09-09 22:35:05 UTC (rev 38543)
+++ 
mmbase/trunk/core/src/main/java/org/mmbase/storage/implementation/database/ViewDatabaseStorageManager.java
  2009-09-09 23:02:45 UTC (rev 38544)
@@ -72,7 +72,7 @@
      */
     @Override public void create(MMObjectBuilder builder) throws 
StorageException {
         if(!viewExists(builder)){
-             viewCreate(builder);
+            viewCreate(builder);
         }
     }
 
@@ -87,7 +87,9 @@
                 super.create(node, builder);
             } else {
                 // insert in parent tables (from parents to childs) 
(especially because foreign keys on object's number may exist)
+                assert node.getNumber() > 0;
                 for (MMObjectBuilder b : builder.getAncestors()) {
+                    assert node.getNumber() > 0 : "" + node;
                     createObject(node, b);
                 }
                 createObject(node, builder);
@@ -181,6 +183,9 @@
                 super.delete(node, builder);
             } else {
                 do {
+                    assert node.getIntValue("otype") > 0;
+                    assert node.getNumber() > 0;
+
                     deleteObject(node, builder);
                     builder = builder.getParentBuilder();
                 } while (builder!=null);
@@ -205,7 +210,13 @@
             }
         }
         String tablename = getTableName(builder);
+        assert node.getIntValue("otype") > 0;
+        assert node.getNumber() > 0;
+
         super.delete(node, builder, blobFileField, tablename);
+        assert node.getIntValue("otype") > 0;
+        assert node.getNumber() > 0;
+
     }
 
     protected String getFieldName(CoreField field) {
@@ -256,7 +267,8 @@
      * Override the default version. An index should only be created if
      * all the fields are in this builder. Otherwise this will fail horrably.
      */
-    @Override protected void create(Index index) throws StorageException {
+    @Override
+    protected void create(Index index) throws StorageException {
         for (int i=0; i<index.size(); i++) {
             CoreField f = (CoreField)index.get(i);
             if (!isPartOfBuilderDefinition(f)) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs