From c7150cabdc91de50be5b511084883c0b5a980330 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 7 Aug 2007 18:05:49 +0000
Subject: [PATCH] Small fix from Zell.

---
 .../com/samskivert/jdbc/depot/DepotMarshaller.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
index fbe858d..d332dc9 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
@@ -72,7 +72,6 @@ public class DepotMarshaller<T extends PersistentRecord>
     public DepotMarshaller (Class<T> pclass, PersistenceContext context)
     {
         _pclass = pclass;
-
         Entity entity = pclass.getAnnotation(Entity.class);
 
         // see if this is a computed entity
@@ -559,9 +558,10 @@ public class DepotMarshaller<T extends PersistentRecord>
             }
         });
 
+        final Entity entity = _pclass.getAnnotation(Entity.class);
+
         // if the table does not exist, create it
         if (!metaData.tableExists) {
-            final Entity entity = _pclass.getAnnotation(Entity.class);
             final String[] fDeclarations = declarations;
             final String[][] fUniqueConstraintColumns = uniqueConstraintColumns;
 
@@ -583,9 +583,11 @@ public class DepotMarshaller<T extends PersistentRecord>
                         fUniqueConstraintColumns, primaryKeyColumns);
 
                     // add its indexen
-                    for (Index idx : entity.indices()) {
-                        liaison.addIndexToTable(
-                            conn, getTableName(), idx.columns(), idx.name(), idx.unique());
+                    if (entity != null) {
+                        for (Index idx : entity.indices()) {
+                            liaison.addIndexToTable(
+                                conn, getTableName(), idx.columns(), idx.name(), idx.unique());
+                        }
                     }
                     if (_keyGenerator != null) {
                         _keyGenerator.init(conn, liaison);
@@ -705,7 +707,6 @@ public class DepotMarshaller<T extends PersistentRecord>
             });
         }
 
-        Entity entity = _pclass.getAnnotation(Entity.class);
         // add any missing indices
         for (final Index index : (entity == null ? new Index[0] : entity.indices())) {
             if (metaData.indexColumns.containsKey(index.name())) {