From beabdb382c2c85a155c3320aaa292467786f3f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 29 Oct 2009 19:03:12 +0100
Subject: [PATCH] ItEr32S12CUAsignacionGrupoRecursosAPlanificacionItEr31S15: If
 it's the same the allocation the merge process is not needed

---
 .../business/planner/entities/GenericResourceAllocation.java   | 3 +++
 .../business/planner/entities/SpecificResourceAllocation.java  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
index e0cfa8c33..b1c381df0 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
@@ -226,6 +226,9 @@ public class GenericResourceAllocation extends
 
     @Override
     public void mergeAssignmentsAndResourcesPerDay(ResourceAllocation<?> modifications) {
+        if (modifications == this) {
+            return;
+        }
         Validate.isTrue(modifications instanceof GenericResourceAllocation);
         mergeAssignments((GenericResourceAllocation) modifications);
         setResourcesPerDay(modifications.getResourcesPerDay());
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
index 87f1ced97..de03b3dae 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
@@ -163,6 +163,9 @@ public class SpecificResourceAllocation extends
 
     @Override
     public void mergeAssignmentsAndResourcesPerDay(ResourceAllocation<?> modifications) {
+        if (modifications == this) {
+            return;
+        }
         Validate.isTrue(modifications instanceof SpecificResourceAllocation);
         mergeAssignments((SpecificResourceAllocation) modifications);
         setResourcesPerDay(modifications.getResourcesPerDay());