From 3017d1c54117e2d4287f7ba2842c6c4e4a0a52a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 21 Dec 2009 14:39:44 +0100
Subject: [PATCH] ItEr40S05ValidacionEProbasFuncionaisItEr39S05: Doing a more
 failsafe detaching of formBinder

---
 .../web/planner/allocation/FormBinder.java           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
index ea22ab037..1b1952f11 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
@@ -491,10 +491,14 @@ class FormBinder {
     }
 
     public void detach() {
-        this.applyButton.removeEventListener(Events.ON_CLICK,
-                applyButtonListener);
-        this.recommendedAllocationCheckbox.removeEventListener(Events.ON_CHECK,
-                recommendedCheckboxListener);
+        if (this.applyButton != null) {
+            this.applyButton.removeEventListener(Events.ON_CLICK,
+                    applyButtonListener);
+        }
+        if (this.recommendedAllocationCheckbox != null) {
+            this.recommendedAllocationCheckbox.removeEventListener(
+                    Events.ON_CHECK, recommendedCheckboxListener);
+        }
         for (InputElement inputElement : inputsAssociatedWithOnChangeEnableApply) {
             inputElement.removeEventListener(Events.ON_CHANGE,
                     onChangeEnableApply);