import org.argeo.cms.CmsImageManager;
import org.argeo.cms.CmsNames;
import org.argeo.cms.CmsTypes;
-import org.argeo.cms.CmsUtils;
+import org.argeo.cms.util.CmsUtils;
import org.argeo.jcr.JcrUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.service.ResourceManager;
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);
}
// 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);