Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-11-05 10:37:58 +0000
committerEike Stepper2020-11-05 10:37:58 +0000
commit454d78b2b30cd0da70b252a2d8df7180fa1f0ca9 (patch)
tree826151d1e49ccd9665c0f41a9f95131f109cc859 /plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf
parent9c0cb7aec0726fc807ae8480a656e34459b9c285 (diff)
downloadcdo-454d78b2b30cd0da70b252a2d8df7180fa1f0ca9.tar.gz
cdo-454d78b2b30cd0da70b252a2d8df7180fa1f0ca9.tar.xz
cdo-454d78b2b30cd0da70b252a2d8df7180fa1f0ca9.zip
[568304] [DB] NIL value not restored from DB for a feature with null default value
https://bugs.eclipse.org/bugs/show_bug.cgi?id=568304
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
index 7b9e57251a..8a58ef0f52 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.java
@@ -194,7 +194,7 @@ public abstract class AbstractTypeMapping implements ITypeMapping
public final Object readValue(ResultSet resultSet) throws SQLException
{
Object value = getResultSetValue(resultSet);
- if (resultSet.wasNull())
+ if (value != CDORevisionData.NIL && resultSet.wasNull())
{
if (feature.isMany())
{

Back to the top