Merge remote branch 'upstream/master'

2 files changed, 59 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 8d821174..8027473b 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -19,6 +19,7 @@
 package com.gluster.storage.management.client;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -119,14 +120,43 @@ public class GlusterDataModelManager {
 		}
 		
 		logger.info("Starting data sync");
-		updateModel(fetchData(clusterName));
-		syncInProgress = false;
+		try {
+			updateModel(fetchData(clusterName));
+		} catch(Exception e) {
+			logger.error("Error in data sync!", e);
+		} finally {
+			syncInProgress = false;
+		}
 	}
 	
+
 	private void updateModel(GlusterDataModel model) {
 		updateVolumes(model);
 		updateGlusterServers(model);
 		updateDiscoveredServers(model);
+		updateTasks(model);
+	}
+	
+	private void updateTasks(GlusterDataModel newModel) {
+		List<TaskInfo> oldTasks = model.getCluster().getTaskInfoList();
+		List<TaskInfo> newTasks = newModel.getCluster().getTaskInfoList();
+		
+		Set<TaskInfo> addedTasks = GlusterCoreUtil.getAddedEntities(oldTasks, newTasks, true);
+		for(TaskInfo task : addedTasks) {
+			addTask(task);
+		}
+		
+		Set<TaskInfo> removedTasks = GlusterCoreUtil.getAddedEntities(newTasks, oldTasks, true);
+		for(TaskInfo task : removedTasks) {
+			removeTask(task);
+		}
+		
+		Map<TaskInfo, TaskInfo> modifiedTasks = GlusterCoreUtil.getModifiedEntities(oldTasks, newTasks);
+		for(Entry<TaskInfo, TaskInfo> entry : modifiedTasks.entrySet()) {
+			TaskInfo modifiedTask = entry.getKey();
+			modifiedTask.copyFrom(entry.getValue());
+			updateTask(modifiedTask);
+		}
 	}
 
 	private void updateDiscoveredServers(GlusterDataModel newModel) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
index d3267ec4..43299863 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
@@ -110,4 +110,31 @@ public class TaskInfo extends Entity {
 	public boolean filter(String filterString, boolean caseSensitive) {
 		return StringUtil.filterString(getDescription() + getStatus().getMessage(), filterString, caseSensitive);
 	}
+
+	public void copyFrom(TaskInfo newTask) {
+		setName(newTask.getName());
+		setDescription(newTask.getDescription());
+		setReference(newTask.getReference());
+		setStatus(newTask.getStatus());
+		setType(newTask.getType());
+		setPauseSupported(newTask.getPauseSupported());
+		setStopSupported(newTask.getStopSupported());
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if(!(obj instanceof TaskInfo)) {
+			return false;
+		}
+		
+		TaskInfo newTask = (TaskInfo)obj;
+		if (newTask.getName().equals(getName()) && newTask.getDescription().equals(getDescription())
+				&& newTask.getReference().equals(getReference()) && newTask.getStatus().equals(getStatus())
+				&& newTask.getType() == getType() && newTask.getPauseSupported() == getPauseSupported()
+				&& newTask.getStopSupported() == getStopSupported()) {
+			return true;
+		}
+		
+		return false;
+	}
 }