r1516 - xwiki/trunk/core/src/main/java/com/xpn/xwiki/api

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-07 21:22:39 +0100 (Tue, 07 Nov 2006)
New Revision: 1516

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
Log:
catch NullPointerException in getValue and return null instead

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-07 16:43:28 UTC (rev 1515)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-07 20:22:39 UTC (rev 1516)
@@ -1049,9 +1049,12 @@
         else
             object = currentObj;
         if (object != null) {
-            //com.xpn.xwiki.objects.classes.PropertyClass pclass = (PropertyClass) object.getBaseObject().getxWikiClass(context).get(fieldName);
-            //return getDoc().displayView(pclass, fieldName, object.getBaseObject(), context);
-            return ((BaseProperty) object.getBaseObject().safeget(fieldName)).getValue();
+            try {
+                return ((BaseProperty) object.getBaseObject().safeget(fieldName)).getValue();
+            }
+            catch(NullPointerException e){
+                return null;
+            }
         }
         return null;
     }