Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2014-12-09 15:15:24 +0000
committerEsteban Dugueperoux2014-12-09 15:15:24 +0000
commit9f4ef75f80b9ccbdce23015547fd6c8b7e4a8235 (patch)
tree86c446bb5ae65ffd071554433ab3bdc83f58abc9 /plugins
parent8d3f91b689f62ccb460bf4d38b8446b3ba5c2d42 (diff)
downloadcdo-9f4ef75f80b9ccbdce23015547fd6c8b7e4a8235.tar.gz
cdo-9f4ef75f80b9ccbdce23015547fd6c8b7e4a8235.tar.xz
cdo-9f4ef75f80b9ccbdce23015547fd6c8b7e4a8235.zip
[453173] Reduce consumed memory by DBStore
Add a "!=null" check on store properties in case DBStore is created with null properties, for example when calling CDODBUtil.createStore(). Change-Id: Iefa9f756e40b6f8a52e6058bff2ee8793c4f51b7 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=453173 Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index be552add80..7f487fd8b9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -815,10 +815,14 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
boolean oldValue = DBField.isTrackConstruction();
try
{
- String prop = getStore().getProperties().get(IDBStore.Props.FIELD_CONSTRUCTION_TRACKING);
- if (prop != null)
+ Map<String, String> properties = getStore().getProperties();
+ if (properties != null)
{
- DBField.trackConstruction(Boolean.valueOf(prop));
+ String prop = properties.get(IDBStore.Props.FIELD_CONSTRUCTION_TRACKING);
+ if (prop != null)
+ {
+ DBField.trackConstruction(Boolean.valueOf(prop));
+ }
}
super.doWrite(context, monitor);

Back to the top