summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-08-23 07:07:28 -0700
committerShireesh Anjal <anjalshireesh@gmail.com>2011-08-23 07:07:28 -0700
commitf002af99145c25240ea40c71903fac9a06231343 (patch)
tree933e64f5e6944075d6a5475f3b54063ca69cdb7b /src
parent6f202adedede678479c144b89664a6e0025c0e0e (diff)
parent369802ac7ff537f40e9ff7dbce1806254f414af9 (diff)
Merge pull request #274 from Selvasundaram/master
Modified Volume#equals to correctly check for added/removed bricks
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 65bec003..9356f14a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -330,6 +330,14 @@ public class Volume extends Entity {
if(oldBricks.size() != newBricks.size()) {
return false;
}
+
+ if(!GlusterCoreUtil.getAddedEntities(oldBricks, newBricks, false).isEmpty()) {
+ return false;
+ }
+
+ if(!GlusterCoreUtil.getAddedEntities(newBricks, oldBricks, false).isEmpty()) {
+ return false;
+ }
Map<Brick, Brick> modifiedBricks = GlusterCoreUtil.getModifiedEntities(oldBricks, newBricks);
if(modifiedBricks.size() > 0) {