r1479 - xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes

[Ludovic Dubost]

Author: ludovic
Date: 2006-10-30 09:31:10 +0100 (Mon, 30 Oct 2006)
New Revision: 1479

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
Log:
Fix some get functions in BaseClass that could return a null value

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java	2006-10-30 08:22:44 UTC (rev 1478)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java	2006-10-30 08:31:10 UTC (rev 1479)
@@ -627,6 +627,8 @@
     }
 
     public void setNameField(String nameField) {
+        if (nameField==null)
+         return "";
         this.nameField = nameField;
     }
 
@@ -680,7 +682,10 @@
     }
 
     public String getValidationScript() {
-        return validationScript;
+        if (validationScript==null)
+         return "";
+        else
+         return validationScript;
     }
 
     public boolean validateObject(BaseObject obj, XWikiContext context) throws XWikiException {