AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bogus null checks and assignments.

Browse Source
This commit is contained in:
Michael Bayne
2008-08-04 00:49:37 +00:00
parent 8f2cf98c17
commit f07694895e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/jdbc/depot/BuildVisitor.java
+2 -2
View File
@@ -515,12 +515,12 @@ public abstract class BuildVisitor implements ExpressionVisitor
throws Exception throws Exception
{ {
DepotMarshaller<?> dm = _types.getMarshaller(type); DepotMarshaller<?> dm = _types.getMarshaller(type);
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
if (dm == null) { if (dm == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Unknown field on persistent record [record=" + type + ", field=" + field + "]"); "Unknown field on persistent record [record=" + type + ", field=" + field + "]");
} }
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
appendIdentifier(fm.getColumnName()); appendIdentifier(fm.getColumnName());
} }
@@ -530,12 +530,12 @@ public abstract class BuildVisitor implements ExpressionVisitor
throws Exception throws Exception
{ {
DepotMarshaller<?> dm = _types.getMarshaller(type); DepotMarshaller<?> dm = _types.getMarshaller(type);
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
if (dm == null) { if (dm == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Unknown field on persistent record [record=" + type + ", field=" + field + "]"); "Unknown field on persistent record [record=" + type + ", field=" + field + "]");
} }
FieldMarshaller<?> fm = dm.getFieldMarshaller(field);
Map<String, FieldDefinition> fieldOverrides = _definitions.get(type); Map<String, FieldDefinition> fieldOverrides = _definitions.get(type);
if (fieldOverrides != null) { if (fieldOverrides != null) {
// first, see if there's a field override // first, see if there's a field override