summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-13 06:58:52 (EDT)
committerEike Stepper2007-09-13 06:58:52 (EDT)
commitdd653833294379580e896a8da93926f2d342bc83 (patch)
treee279bc3d0e59e3bf39c8dbc74a4c41d3d5e771d5
parentbcb3b2beb4819c4c571c128ab6c0eb625b4d528a (diff)
downloadcdo-dd653833294379580e896a8da93926f2d342bc83.zip
cdo-dd653833294379580e896a8da93926f2d342bc83.tar.gz
cdo-dd653833294379580e896a8da93926f2d342bc83.tar.bz2
[202833] Horizontal Mapping Strategy
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202833
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java1
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java1
5 files changed, 19 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
index 4d9b08d..90f07b5 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
@@ -349,6 +349,7 @@ public abstract class MappingStrategy implements IMappingStrategy
builder.append(resourceTable);
builder.append(" WHERE ");
builder.append(whereField.getName());
+ builder.append("=");
getStore().getDBAdapter().appendValue(builder, whereField, whereValue);
String sql = builder.toString();
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index e31e791..61ab361 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -83,6 +83,7 @@ public final class DBUtil
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
return ex;
}
}
@@ -100,6 +101,7 @@ public final class DBUtil
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
return ex;
}
}
@@ -113,10 +115,20 @@ public final class DBUtil
{
try
{
+ resultSet.getStatement().setMaxRows(0);
+ }
+ catch (Exception ex)
+ {
+ OM.LOG.error(ex);
+ }
+
+ try
+ {
resultSet.close();
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
return ex;
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
index d939a22..0f8ca0a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.om.trace;
+import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.util.io.IOUtil;
import java.io.DataInputStream;
@@ -92,6 +93,7 @@ public class RemoteTraceServer
}
catch (IOException ex)
{
+ OM.LOG.error(ex);
return ex;
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
index 76a2930..1f5aa29 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -10,6 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.util.io;
+import org.eclipse.net4j.internal.util.bundle.OM;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
@@ -125,6 +127,7 @@ public final class IOUtil
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
return ex;
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index e4297cb..0998b5d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -104,6 +104,7 @@ public final class LifecycleUtil
}
catch (Exception ex)
{
+ OM.LOG.error(ex);
return ex;
}
}