From 8005ef8432e87bae0a3322cb27086d02cd944428 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 1 Aug 2015 21:07:09 +1200
Subject: [PATCH] No effective change - simplify if

---
 .../deploy/parse/DeployInheritInfo.java       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index b79b784b7..6cd5cb5e7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -188,17 +188,15 @@ public class DeployInheritInfo {
     public void setDiscriminatorValue(String value) {
         if (value != null){
         	value = value.trim();
-        	if (value.length() == 0){
-        		value = null;
-        	} else {
-            	discriminatorStringValue = value;
-        		// convert the value if desired
-	        	if (discriminatorType == Types.INTEGER){
-	        		this.discriminatorObjectValue = Integer.valueOf(value);
-	        	} else {
-	        		this.discriminatorObjectValue = value;
-	        	}
-        	}
+          if (value.length() != 0) {
+              discriminatorStringValue = value;
+            // convert the value if desired
+            if (discriminatorType == Types.INTEGER){
+              this.discriminatorObjectValue = Integer.valueOf(value);
+            } else {
+              this.discriminatorObjectValue = value;
+            }
+          }
         }
     }