From edd47c68c6a08bd756d96213c38e896a0a257bd1 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Mon, 13 Jan 2014 18:12:51 +0000
Subject: [PATCH] #394 feature - Several fixes related with form management

---
 securis/src/main/java/net/curisit/securis/db/Organization.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/db/Organization.java b/securis/src/main/java/net/curisit/securis/db/Organization.java
index fd107b9..57e536a 100644
--- a/securis/src/main/java/net/curisit/securis/db/Organization.java
+++ b/securis/src/main/java/net/curisit/securis/db/Organization.java
@@ -136,8 +136,12 @@
 	// information about the referenced entities.
 	@JsonProperty("org_parent_id")
 	public void setParentOrgId(Integer orgId) {
-		parentOrganization = new Organization();
-		parentOrganization.setId(orgId);
+		if (orgId != null) {
+			parentOrganization = new Organization();
+			parentOrganization.setId(orgId);
+		} else {
+			parentOrganization = null;
+		}
 	}
 
 	@JsonProperty("org_parent_id")

--
Gitblit v1.3.2