From e56a24a351b0b9c14f0bf63dc20ab22769cc49b0 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Wed, 8 Oct 2008 12:10:30 +0000
Subject: [PATCH] Fix for exception thrown when clicking Details of a
 file/folder Link object. Fix to query so that OpenSearch People search finds
 some useful results and doesn't potentially throw exception when certain
 characters are passed to the query - ETWONINE-7.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/bean/LinkPropertiesDialog.java        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
index 8857c1e2f5..0e8a9fca2c 100644
--- a/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
@@ -56,11 +56,12 @@ public class LinkPropertiesDialog extends BaseDialogBean
 {
    private static final long serialVersionUID = -167326851073011187L;
    
-   private Node editableNode;
+   private Node editableNode = null;
+   
    
    public Map<String, Object> getProperties()
    {
-      return this.editableNode.getProperties();
+      return getEditableNode().getProperties();
    }
    
    @Override
@@ -76,6 +77,17 @@ public class LinkPropertiesDialog extends BaseDialogBean
     */
    public Node getEditableNode()
    {
+      if (this.editableNode == null)
+      {
+         if (this.parameters.containsKey("nodeRef"))
+         {
+            this.editableNode = new Node(new NodeRef(this.parameters.get("nodeRef")));
+         }
+         else
+         {
+            throw new IllegalArgumentException("Dialog has not been initialised with noderef or setup action event called.");
+         }
+      }
       return this.editableNode;
    }
    
@@ -104,7 +116,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
     */
    public String getDestinationPath()
    {
-      NodeRef destRef = (NodeRef)this.editableNode.getProperties().get(ContentModel.PROP_LINK_DESTINATION);
+      NodeRef destRef = (NodeRef)getEditableNode().getProperties().get(ContentModel.PROP_LINK_DESTINATION);
       return Repository.getNamePath(
             this.getNodeService(), this.getNodeService().getPath(destRef), null, "/", null);
    }
@@ -136,8 +148,8 @@ public class LinkPropertiesDialog extends BaseDialogBean
    {
       try
       {
-         NodeRef nodeRef = this.editableNode.getNodeRef();
-         Map<String, Object> props = this.editableNode.getProperties();
+         NodeRef nodeRef = getEditableNode().getNodeRef();
+         Map<String, Object> props = getEditableNode().getProperties();
          
          Map<QName, Serializable> properties = this.getNodeService().getProperties(nodeRef);