summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-04-04 05:09:00 (EDT)
committerCaspar De Groot2011-04-04 05:09:00 (EDT)
commitb27a33d28e898322a8bd08dc3e4857e63d587239 (patch)
tree60d9db2004f399fea574bae0c2ee378ad2f61c30
parente62687375c70b2282d1150de2bda85339d327f88 (diff)
downloadcdo-b27a33d28e898322a8bd08dc3e4857e63d587239.zip
cdo-b27a33d28e898322a8bd08dc3e4857e63d587239.tar.gz
cdo-b27a33d28e898322a8bd08dc3e4857e63d587239.tar.bz2
[Bug 338894] [DB][Mysql] Exception when CDO is idle for a while
https://bugs.eclipse.org/bugs/show_bug.cgi?id=338894
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java6
2 files changed, 6 insertions, 3 deletions
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index cd41f86..86c37d9 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -24,6 +24,9 @@
-->
<store type="db">
+
+ <!-- Period at which to execute an SQL statement to keep DB connection alive, in minutes -->
+ <property name="connectionKeepAlivePeriod" value="60"/>
<mappingStrategy type="horizontal">
<property name="qualifiedNames" value="false"/>
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
index 4d6be2d..fba6ed7 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStore.java
@@ -328,7 +328,7 @@ public class ObjectivityStore extends Store implements IObjectivityStore
}
- public Map<String, String> getPropertyValues(Set<String> names)
+ public Map<String, String> getPersistentProperties(Set<String> names)
{
if (names == null || names.isEmpty())
{
@@ -345,7 +345,7 @@ public class ObjectivityStore extends Store implements IObjectivityStore
return properties;
}
- public void setPropertyValues(Map<String, String> properties)
+ public void setPersistentProperties(Map<String, String> properties)
{
ObjySession objySession = objyConnection.getWriteSessionFromPool("Main");
objySession.begin();
@@ -353,7 +353,7 @@ public class ObjectivityStore extends Store implements IObjectivityStore
objySession.commit();
}
- public void removePropertyValues(Set<String> names)
+ public void removePersistentProperties(Set<String> names)
{
ObjySession objySession = objyConnection.getWriteSessionFromPool("Main");
objySession.begin();