From a1199687d4d53ad9240b2e0a845daafdd59701e0 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Thu, 13 Sep 2012 00:17:49 -0300
Subject: [PATCH] Fix problem opening public maps.

---
 .../com/wisemapping/dao/MindmapManager.java     |  2 ++
 .../java/com/wisemapping/view/MindMapBean.java  | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
index edb4435e..1175a997 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
@@ -20,6 +20,7 @@ package com.wisemapping.dao;
 
 import com.wisemapping.model.*;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -37,6 +38,7 @@ public interface MindmapManager {
 
     List<Mindmap> getAllMindmaps();
 
+    @Nullable
     Mindmap getMindmapById(int mindmapId);
 
     Mindmap getMindmapByTitle(final String name, final User user);
diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
index ba6c9189..adf14ea1 100644
--- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
+++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
@@ -18,6 +18,7 @@
 
 package com.wisemapping.view;
 
+import com.wisemapping.exceptions.AccessDeniedSecurityException;
 import com.wisemapping.exceptions.WiseMappingException;
 import com.wisemapping.model.*;
 import org.jetbrains.annotations.NotNull;
@@ -126,14 +127,22 @@ public class MindMapBean {
     }
 
     public String getProperties() throws WiseMappingException {
-        String result;
+        String result = null;
+
         if (collaborator != null) {
-            final CollaborationProperties properties = this.mindmap.findCollaborationProperties(collaborator);
-            result = properties.getMindmapProperties();
-        } else {
+            try {
+                final CollaborationProperties properties = this.mindmap.findCollaborationProperties(collaborator);
+                result = properties.getMindmapProperties();
+            } catch (AccessDeniedSecurityException e) {
+                // Ignore exception. This is required for the admin could view maps ...
+            }
+        }
+
+        if (result == null) {
             // It must be public view ...
             result = CollaborationProperties.DEFAULT_JSON_PROPERTIES;
         }
+
         return result;
     }