Try using /data for images

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / ImageManagerImpl.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
index b1d27e516092fe63eda29a750660f7227d974a8f..8c55674b1d5b8322b30db70c35fbbdfc2c2741ff 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
@@ -164,6 +164,9 @@ public class ImageManagerImpl implements CmsImageManager, CmsNames {
        /** @return null if not available */
        @Override
        public String getImageUrl(Node node) throws RepositoryException {
+//             String url = "/data/public/node/main"
+//                             + node.getPath();
+//             return url;
                String name = getResourceName(node);
                ResourceManager resourceManager = RWT.getResourceManager();
                if (!resourceManager.isRegistered(name)) {
@@ -178,8 +181,8 @@ public class ImageManagerImpl implements CmsImageManager, CmsNames {
                                IOUtils.closeQuietly(inputStream);
                                JcrUtils.closeQuietly(binary);
                        }
-                       if (log.isDebugEnabled())
-                               log.debug("Registered image " + name);
+                       if (log.isTraceEnabled())
+                               log.trace("Registered image " + name);
                }
                return resourceManager.getLocation(name);
        }
@@ -225,7 +228,7 @@ public class ImageManagerImpl implements CmsImageManager, CmsNames {
                        if (parentNode.hasNode(fileName)) {
                                Node node = parentNode.getNode(fileName);
                                previousResourceName = getResourceName(node);
-                               if (node.hasNode(JCR_CONTENT)){
+                               if (node.hasNode(JCR_CONTENT)) {
                                        node.getNode(JCR_CONTENT).remove();
                                        node.addNode(JCR_CONTENT, NT_RESOURCE);
                                }
@@ -245,7 +248,8 @@ public class ImageManagerImpl implements CmsImageManager, CmsNames {
 
                        // reset resource manager
                        ResourceManager resourceManager = RWT.getResourceManager();
-                       if (resourceManager.isRegistered(previousResourceName)) {
+                       if (previousResourceName != null
+                                       && resourceManager.isRegistered(previousResourceName)) {
                                resourceManager.unregister(previousResourceName);
                                if (log.isDebugEnabled())
                                        log.debug("Unregistered image " + previousResourceName);