Issue #68.

highsource · Apr 6, 2016 · 06d6f97 · 06d6f97
1 parent 01deed4
commit 06d6f97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java
@@ -111,10 +111,18 @@ protected void generate(ClassOutline classOutline, JDefinedClass theClass) {
 				final Collection<JType> possibleTypes = FieldUtils
 						.getPossibleTypes(fieldOutline, Aspect.EXPOSED);
 				final boolean isAlwaysSet = leftFieldAccessor.isAlwaysSet();
-				final JExpression leftHasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
-						: leftValue.ne(JExpr._null());
-				final JExpression rightHasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
-						: rightValue.ne(JExpr._null());
+//				final JExpression leftHasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
+//						: leftValue.ne(JExpr._null());
+				final JExpression leftHasSetValue = (leftFieldAccessor.isAlwaysSet() || leftFieldAccessor
+						.hasSetValue() == null) ? JExpr.TRUE
+						: leftFieldAccessor.hasSetValue();					
+
+//				final JExpression rightHasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
+//						: rightValue.ne(JExpr._null());
+
+				final JExpression rightHasSetValue = (rightFieldAccessor.isAlwaysSet() || rightFieldAccessor
+						.hasSetValue() == null) ? JExpr.TRUE
+						: rightFieldAccessor.hasSetValue();
 
 				getCodeGenerator().generate(
 						block,

diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java
@@ -105,8 +105,12 @@ protected void generate(ClassOutline classOutline, JDefinedClass theClass) {
 					final Collection<JType> possibleTypes = FieldUtils
 							.getPossibleTypes(fieldOutline, Aspect.EXPOSED);
 					final boolean isAlwaysSet = fieldAccessor.isAlwaysSet();
-					final JExpression hasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
-							: value.ne(JExpr._null());
+//					final JExpression hasSetValue = exposedType.isPrimitive() ? JExpr.TRUE
+//							: value.ne(JExpr._null());
+
+					final JExpression hasSetValue = (fieldAccessor.isAlwaysSet() || fieldAccessor
+							.hasSetValue() == null) ? JExpr.TRUE
+							: fieldAccessor.hasSetValue();					
 					getCodeGenerator().generate(
 							block,
 							exposedType,