From 13ed2707b2bcd5388fb1bc08df5daca856e5a6f4 Mon Sep 17 00:00:00 2001
From: Britt Park <britt.park@alfresco.com>
Date: Fri, 22 Sep 2006 18:48:00 +0000
Subject: [PATCH] Removes a source of embarassing NPEs.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/avm/AVMStoreImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index 7d6fd83add..375d8c0cdb 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -1042,7 +1042,12 @@ public class AVMStoreImpl implements AVMStore, Serializable
      */
     public PropertyValue getProperty(QName name)
     {
-        return AVMContext.fgInstance.fAVMStorePropertyDAO.get(this, name).getValue();
+        AVMStoreProperty prop = AVMContext.fgInstance.fAVMStorePropertyDAO.get(this, name);
+        if (prop == null)
+        {
+            return null;
+        }
+        return prop.getValue();
     }
     
     /**