Fixed some bogus null checks and assignments.

This commit is contained in:
Michael Bayne
2008-08-04 00:49:37 +00:00
parent 8f2cf98c17
commit f07694895e
@@ -515,12 +515,12 @@ public abstract class BuildVisitor implements ExpressionVisitor
throws Exception
{
DepotMarshaller<?> dm = _types.getMarshaller(type);
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
if (dm == null) {
throw new IllegalArgumentException(
"Unknown field on persistent record [record=" + type + ", field=" + field + "]");
}
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
appendIdentifier(fm.getColumnName());
}
@@ -530,12 +530,12 @@ public abstract class BuildVisitor implements ExpressionVisitor
throws Exception
{
DepotMarshaller<?> dm = _types.getMarshaller(type);
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
if (dm == null) {
throw new IllegalArgumentException(
"Unknown field on persistent record [record=" + type + ", field=" + field + "]");
}
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
Map<String, FieldDefinition> fieldOverrides = _definitions.get(type);
if (fieldOverrides != null) {
// first, see if there's a field override