Changeset 5400

Timestamp:

Sep 3, 2010, 12:44:11 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1505: Table exporter fails with NPE when exporting spot data

Location:

trunk/src/clients/web/net/sf/basedb/clients/web/plugins

Files:

• ExportedProperty.java (modified) (1 diff)
• SimpleExport.java (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/ExportedProperty.java

@@ -78 +78 @@
       }
     }
-    else if (dataloader == null)
+    else if (dataloader == null && metadata != null)
     {
       propertyPath = metadata.getPropertyPath(name, false);

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -253 +253 @@
     String entityName = null;
     Class entityClass = null;
+    Metadata metadata = null;
     if (itemType == Item.RAWDATA)
     {
@@ -272 +273 @@
       entityClass = itemType.getDataClass();
     }
-    Metadata metadata = entityName == null ? 
-        Metadata.getInstance(entityClass) : 
-        Metadata.getInstance(entityClass, entityName);
+    if (entityName != null)
+    {
+      metadata = Metadata.getInstance(entityClass, entityName);
+    }
+    else if (entityClass != null)
+    {
+      metadata = Metadata.getInstance(entityClass);
+    }
 
     // Parse the WHICH_PROPERTIES parameter. It is a list of property:title entries