Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2014-10-24 04:30:23 -0400
committerEsteban Dugueperoux2014-10-24 05:17:59 -0400
commitfaf5b160d93ffe6578267eae4bbea9784852c71a (patch)
tree33ad700599fbd2dca645674e06e37aa524cf155f
parentd8fbdf911145817d159f46fa916a1ef102fb79bc (diff)
downloadcdo-faf5b160d93ffe6578267eae4bbea9784852c71a.tar.gz
cdo-faf5b160d93ffe6578267eae4bbea9784852c71a.tar.xz
cdo-faf5b160d93ffe6578267eae4bbea9784852c71a.zip
[448584] NPE on DBAnnotationsTest.testLengthAnnotationNegative()
execution Remove TransactionCommitContext.removePackageAdapters() as it is useless since CDOPackageUnit is not an Adapter anymore (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=406068 ) Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=448584 Change-Id: I5db59d658165e0267a158fa41595e3d05d157a40 Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java20
1 files changed, 1 insertions, 19 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
index 39344b9c2e..3c31053c0c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java
@@ -47,9 +47,9 @@ import org.eclipse.emf.cdo.common.util.CDOQueryInfo;
import org.eclipse.emf.cdo.internal.common.commit.FailureCommitInfo;
import org.eclipse.emf.cdo.internal.common.model.CDOPackageRegistryImpl;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
+import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IStoreAccessor;
import org.eclipse.emf.cdo.server.IStoreAccessor.QueryXRefsContext;
-import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IView;
import org.eclipse.emf.cdo.server.StoreThreadLocal;
import org.eclipse.emf.cdo.spi.common.commit.CDOCommitInfoUtil;
@@ -1257,8 +1257,6 @@ public class TransactionCommitContext implements InternalCommitContext
{
rollbackMessage = message;
- removePackageAdapters();
-
if (accessor != null)
{
try
@@ -1279,22 +1277,6 @@ public class TransactionCommitContext implements InternalCommitContext
}
}
- private void removePackageAdapters()
- {
- for (int i = 0; i < newPackageUnits.length; i++)
- {
- try
- {
- InternalCDOPackageUnit packageUnit = newPackageUnits[i];
- packageUnit.dispose();
- }
- catch (Throwable t)
- {
- OM.LOG.error(t);
- }
- }
- }
-
protected IStoreAccessor getAccessor()
{
return accessor;

Back to the top