Errors on delete site, if folder has quota #8

NodeRef existence control for quota folder
keensoft · Dec 21, 2015 · 2fce1c2 · 2fce1c2
1 parent f7740c9
commit 2fce1c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/alfresco-folder-quota-repo/pom.xml b/alfresco-folder-quota-repo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>alfresco-folder-quota</artifactId>
         <groupId>es.keensoft.alfresco</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...repo/src/main/java/org/alfresco/extension/folderquota/behaviour/FolderQuotaBehaviour.java b/...repo/src/main/java/org/alfresco/extension/folderquota/behaviour/FolderQuotaBehaviour.java
@@ -309,13 +309,16 @@ public String doWork() throws Exception {
         			RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>() {
 
         				public Long execute() throws Throwable {
-        					Long currentSize = (Long) nodeService.getProperty(quotaFolder, FolderQuotaModel.PROP_FQ_SIZE_CURRENT);
-        					if (currentSize == null)  {
-        						currentSize=0L;
+        					Long newSize = 0L;
+        					if (nodeService.exists(quotaFolder)) {
+	        					Long currentSize = (Long) nodeService.getProperty(quotaFolder, FolderQuotaModel.PROP_FQ_SIZE_CURRENT);
+	        					if (currentSize == null)  {
+	        						currentSize=0L;
+	        					}
+	        					newSize = currentSize + sizeChange;
+	        					if (newSize < 0) newSize = 0L;
+	        					nodeService.setProperty(quotaFolder, FolderQuotaModel.PROP_FQ_SIZE_CURRENT, newSize);
         					}
-        					Long newSize = currentSize + sizeChange;
-        					if (newSize < 0) newSize = 0L;
-        					nodeService.setProperty(quotaFolder, FolderQuotaModel.PROP_FQ_SIZE_CURRENT, newSize);
         					return newSize;
         				}
 
@@ -325,7 +328,7 @@ public Long execute() throws Throwable {
         				txnHelper.doInTransaction(callback, false, true);
 
         			} catch (Throwable e) {
-        				logger.error("Failed to update folder size on quota folder node: " + quotaFolder);
+        				logger.error("Failed to update folder size on quota folder node: " + quotaFolder, e);
         			}
         			return "";
         		}

diff --git a/alfresco-folder-quota-share/pom.xml b/alfresco-folder-quota-share/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>alfresco-folder-quota</artifactId>
         <groupId>es.keensoft.alfresco</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>es.keensoft.alfresco</groupId>
     <artifactId>alfresco-folder-quota</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>alfresco-folder-quota project</name>
     <packaging>pom</packaging>