From: Bruno Sinou <bsinou@argeo.org>
Date: Fri, 3 Apr 2015 12:13:48 +0000 (+0000)
Subject: Fix NPE
X-Git-Tag: argeo-commons-2.1.30~280
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=34ac6c6399d0481c620e4ba9ed5e712895f0e30c;p=lgpl%2Fargeo-commons.git

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 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);