Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-04-19 05:54:19 -0400
committerEike Stepper2013-04-19 05:54:19 -0400
commitb0ce7501cb2566d97733dd7a07d73b5d72f72134 (patch)
treebc16684269c8b9d67366e5f95bab9f07250c52a8
parenta35435d84edb5282707ec3c262277cad89ab3e0b (diff)
downloadcdo-b0ce7501cb2566d97733dd7a07d73b5d72f72134.tar.gz
cdo-b0ce7501cb2566d97733dd7a07d73b5d72f72134.tar.xz
cdo-b0ce7501cb2566d97733dd7a07d73b5d72f72134.zip
[406068] Memory leak through CDOPackageInfo adapters on EPackages drops/I20130503-0410drops/I20130426-0410
https://bugs.eclipse.org/bugs/show_bug.cgi?id=406068
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java3
2 files changed, 12 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
index 34a4ab4e83..fa8d2c03c9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
@@ -190,6 +190,16 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
* @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
*/
@Deprecated
+ public void unsetTarget(Notifier oldTarget)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
+ * @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
+ */
+ @Deprecated
public boolean isAdapterForType(Object type)
{
throw new UnsupportedOperationException();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
index 5dc18f18fa..c1fe0046cd 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
import org.eclipse.emf.cdo.common.protocol.CDODataInput;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
+import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.ecore.EPackage;
import java.io.IOException;
@@ -26,7 +27,7 @@ import java.io.IOException;
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
-public interface InternalCDOPackageInfo extends CDOPackageInfo
+public interface InternalCDOPackageInfo extends CDOPackageInfo, Adapter.Internal
{
public InternalCDOPackageUnit getPackageUnit();

Back to the top