1 files changed, 11 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
index 971d7830b6..442904a61d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
@@ -89,10 +89,13 @@ public abstract class ValueMapping extends Mapping implements IValueMapping
       }
     }
 
-    for (IAttributeMapping attributeMapping : attributeMappings)
+    if (attributeMappings != null)
     {
-      builder.append(", ");
-      builder.append(attributeMapping.getField().getName());
+      for (IAttributeMapping attributeMapping : attributeMappings)
+      {
+        builder.append(", ");
+        builder.append(attributeMapping.getField().getName());
+      }
     }
 
     builder.append(" FROM ");
@@ -346,9 +349,12 @@ public abstract class ValueMapping extends Mapping implements IValueMapping
         revision.setContainingFeature(resultSet.getInt(i++));
       }
 
-      for (IAttributeMapping attributeMapping : attributeMappings)
+      if (attributeMappings != null)
       {
-        attributeMapping.extractValue(resultSet, i++, revision);
+        for (IAttributeMapping attributeMapping : attributeMappings)
+        {
+          attributeMapping.extractValue(resultSet, i++, revision);
+        }
       }
     }
     catch (SQLException ex)