X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2FImageManagerImpl.java;h=3171b71135c102e43a1d542fbad50ff102cc35e8;hb=998f2785e9571572c21117da28fbd1d681cc33a4;hp=b1d27e516092fe63eda29a750660f7227d974a8f;hpb=d546fc1b9e19a86eb0e33ac4be824b52239316fc;p=lgpl%2Fargeo-commons.git

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 b1d27e516..3171b7113 100644
--- 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);