From e212e29de8b1d7ca847a45bafec2ad82a110765d Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Mon, 4 Aug 2008 00:49:37 +0000
Subject: [PATCH] Fixed some bogus null checks and assignments.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2353 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/jdbc/depot/BuildVisitor.java | 4 ++--
 src/java/com/samskivert/util/ClassUtil.java          | 4 ----
 src/java/com/samskivert/util/IntListUtil.java        | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
index 7816c9bf..10ce0389 100644
--- a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
+++ b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java
@@ -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
diff --git a/src/java/com/samskivert/util/ClassUtil.java b/src/java/com/samskivert/util/ClassUtil.java
index 57605df5..5fea2472 100644
--- a/src/java/com/samskivert/util/ClassUtil.java
+++ b/src/java/com/samskivert/util/ClassUtil.java
@@ -187,8 +187,6 @@ public class ClassUtil
         // an override.  Check implemented interfaces.
         Class<?>[] interfaces = clazz.getInterfaces();
         for (int i = 0; i < interfaces.length; ++i) {
-            overriddenMethod = null;
-
             if (classIsAccessible(interfaces[i])) {
                 try {
                     overriddenMethod = interfaces[i].getMethod(methodName, parameterTypes);
@@ -201,8 +199,6 @@ public class ClassUtil
             }
         }
 
-        overriddenMethod = null;
-
         // Try superclass's superclass and implemented interfaces.
         if (superclass != null) {
             overriddenMethod = getAccessibleMethodFrom(superclass, methodName, parameterTypes);
diff --git a/src/java/com/samskivert/util/IntListUtil.java b/src/java/com/samskivert/util/IntListUtil.java
index 0c3ddd1b..d680a9a4 100644
--- a/src/java/com/samskivert/util/IntListUtil.java
+++ b/src/java/com/samskivert/util/IntListUtil.java
@@ -258,7 +258,7 @@ public class IntListUtil
     public static int removeAt (int[] list, int index)
     {
         int llength = list.length;
-        if (list == null || llength <= index) {
+        if (llength <= index) {
             return 0;
         }