Fix NPE

git-svn-id: https://svn.argeo.org/commons/trunk@8051 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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..3171b71135c102e43a1d542fbad50ff102cc35e8 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
@@ -225,7 +225,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 +245,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);