summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-17 03:10:40 (EDT)
committerEike Stepper2007-09-17 03:10:40 (EDT)
commit3709fa457840ea04db24ffb297ea2ba4dfd6d832 (patch)
treea6bc6e19af03fb44b261c9070000a4417f50db93
parent54e5cda484603615efe67ba22245e202aab89d03 (diff)
downloadcdo-3709fa457840ea04db24ffb297ea2ba4dfd6d832.zip
cdo-3709fa457840ea04db24ffb297ea2ba4dfd6d832.tar.gz
cdo-3709fa457840ea04db24ffb297ea2ba4dfd6d832.tar.bz2
[201366] Random deadlocks
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201366
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java45
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOInvalidationNotificationImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java7
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java22
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java1
42 files changed, 92 insertions, 32 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 829dc99..6d7a8c9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -7,7 +7,7 @@
*
* Contributors:
* Eike Stepper - initial API and implementation
- * Simon McDuff - maintenance https://bugs.eclipse.org/bugs/show_bug.cgi?id=202725
+ * Simon McDuff - https://bugs.eclipse.org/bugs/show_bug.cgi?id=202725
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
@@ -26,6 +26,7 @@ import java.util.Map;
/**
* @author Eike Stepper
+ * @author Simon McDuff
*/
public class SessionManager extends Container<ISession> implements ISessionManager
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java
index c92d712..903d861 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java
@@ -36,6 +36,8 @@ import java.util.ArrayList;
import java.util.List;
/**
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=202063
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class FetchRuleAnalyzerTest extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java
new file mode 100644
index 0000000..72a9991
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Simon McDuff - initial API and implementation
+ * Eike Stepper - maintenance
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests;
+
+import org.eclipse.emf.cdo.CDOSession;
+import org.eclipse.emf.cdo.CDOTransaction;
+
+/**
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=201366
+ * @author Simon McDuff
+ * @author Eike Stepper
+ */
+public class RandomDeadLockTest extends AbstractCDOTest
+{
+ public void testCreateManySession() throws Exception
+ {
+ {
+ CDOSession session = openModel1Session();
+ CDOTransaction transaction = session.openTransaction();
+ transaction.createResource("/test2");
+ transaction.commit();
+ transaction.close();
+ session.close();
+ }
+
+ for (int i = 0; i < 10; i++)
+ {
+ CDOSession session = openModel1Session();
+ CDOTransaction transaction = session.openTransaction();
+ transaction.getResource("/test2");
+ transaction.commit();
+ transaction.close();
+ session.close();
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index 0ccca6e..d0e5722 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import junit.framework.TestCase;
/**
+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=201593
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class ResourceTest extends TestCase
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
index 487c2df..f099d7c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOInvalidationNotification.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.cdo;
import org.eclipse.emf.common.notify.Notification;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public interface CDOInvalidationNotification extends Notification
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
index 9d1e2e7..bd98df4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
/**
* @author Eike Stepper
+ * @author Simon McDuff
*/
public interface CDOView extends INotifier
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java
index d7d84d1..fe77e1a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.internal.cdo.InternalCDOObject;
import org.eclipse.emf.internal.cdo.analyzer.NOOPFeatureAnalyzer;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public interface CDOFeatureAnalyzer
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java
index 531f3ad..b6da0f1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFetchRuleManager.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule;
import org.eclipse.emf.internal.cdo.analyzer.NOOPFetchRuleManager;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public interface CDOFetchRuleManager
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOInvalidationNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOInvalidationNotificationImpl.java
index 83c34dd..cbddf75 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOInvalidationNotificationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOInvalidationNotificationImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOInvalidationNotificationImpl implements CDOInvalidationNotification
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index f211b13..3c23880 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -60,6 +60,7 @@ import org.eclipse.net4j.util.ImplementationError;
/**
* @author Eike Stepper
+ * @author Simon McDuff
*/
public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier implements CDOView, CDOIDProvider,
Adapter.Internal
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java
index 46a7af4..b600904 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAbstractFeatureRuleAnalyzer.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public abstract class CDOAbstractFeatureRuleAnalyzer implements CDOFeatureAnalyzer, CDOFetchRuleManager
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java
index bfd52ce..e202fdc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOAnalyzerFeatureInfo.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOAnalyzerFeatureInfo
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java
index 1a83e04..30d2774 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOClusterOfFetchRule.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOClusterOfFetchRule
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
index 331bbd7..afda4ae 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOFeatureAnalyzerModelBased extends CDOAbstractFeatureRuleAnalyzer
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
index 050b936..bc52914 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerUI.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOFeatureAnalyzerUI extends CDOAbstractFeatureRuleAnalyzer
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java
index ef730c0..bb37200 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchFeatureInfo.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOFetchFeatureInfo
@@ -104,7 +105,7 @@ public class CDOFetchFeatureInfo
@Override
public int hashCode()
{
- return cdoClass.hashCode() ^ cdoFeature.hashCode();
+ return cdoClass.hashCode() ^ cdoFeature.hashCode();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java
index 827adb6..b7b7407 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFetchRuleManagerThreadLocal.java
@@ -19,6 +19,7 @@ import java.util.Collection;
import java.util.List;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class CDOFetchRuleManagerThreadLocal implements CDOFetchRuleManager
@@ -56,9 +57,9 @@ public class CDOFetchRuleManagerThreadLocal implements CDOFetchRuleManager
return analyzer != null ? analyzer.getFetchRules(ids) : null;
}
- public int getLoadRevisionCollectionChunkSize()
+ public int getLoadRevisionCollectionChunkSize()
{
- CDOFetchRuleManager analyzer = CDOFetchRuleManagerThreadLocal.getCurrent();
- return analyzer != null ? analyzer.getLoadRevisionCollectionChunkSize() : 0;
+ CDOFetchRuleManager analyzer = CDOFetchRuleManagerThreadLocal.getCurrent();
+ return analyzer != null ? analyzer.getLoadRevisionCollectionChunkSize() : 0;
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java
index 075369e..0fa1d87 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class NOOPFeatureAnalyzer implements CDOFeatureAnalyzer
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java
index c88b0bd..eea5d1e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFetchRuleManager.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule;
/**
+ * @author Simon McDuff
* @author Eike Stepper
*/
public class NOOPFetchRuleManager implements CDOFetchRuleManager
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
index bca7898..43a9f64 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java
@@ -75,8 +75,6 @@ public final class GenUtil
* Formats a name by parsing it into words separated by underscores and/or mixed-casing and then recombining them
* using the specified separator. A prefix can also be given to be recognized as a separate word or to be trimmed.
* Leading underscores can be ignored or can cause a leading separator to be prepended.
- *
- * @since 2.2
*/
public static String format(String name, char separator, String prefix, boolean includePrefix,
boolean includeLeadingSeparator)
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index c0e3bc0..da8e40d 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -278,6 +278,28 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
}
@Override
+ public void inverseRemoveChannel(short channelIndex)
+ {
+ try
+ {
+ Channel channel = getChannel(channelIndex);
+ if (channel instanceof ControlChannel)
+ {
+ return;
+ }
+
+ if (channel != null)
+ {
+ super.removeChannel(channel);
+ }
+ }
+ catch (RuntimeException ex)
+ {
+ OM.LOG.warn(ex);
+ }
+ }
+
+ @Override
protected boolean removeChannel(Channel channel)
{
if (channel instanceof ControlChannel)
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java
index 3667ae6..7bc1c88 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/TCPUtil.java
@@ -18,7 +18,6 @@ import org.eclipse.net4j.util.container.IManagedContainer;
/**
* @author Eike Stepper
- * @since 0.8.0
*/
public final class TCPUtil
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
index 1c0be54..fb912f7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IPluginContainer.java
@@ -14,7 +14,6 @@ import org.eclipse.net4j.internal.util.container.PluginContainer;
/**
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IPluginContainer extends IManagedContainer
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
index 2feb321..3473373 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
@@ -529,10 +529,6 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
{
throw ex;
}
-
- if (TRACER.isEnabled())
- {
- }
}
}
else
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java
index 35bc4da..7c734de 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java
@@ -26,7 +26,6 @@ import java.nio.channels.SocketChannel;
* COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP>
*
* @author Eike Stepper
- * @since 0.8.0
*/
public enum BufferState
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java
index 06bdb24..3ae0125 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* Thrown by an {@link IConnector} to indicate connection problems.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public class ConnectorException extends RuntimeException
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java
index 6b1be6e..2668684 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java
@@ -30,7 +30,6 @@ package org.eclipse.net4j;
* @see IChannel#sendBuffer(IBuffer)
* @see IChannel#setReceiveHandler(IBufferHandler)
* @author Eike Stepper
- * @since 0.8.0
*/
public enum ConnectorLocation
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java
index d8f842e..c78ce81 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java
@@ -30,7 +30,6 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
*
* @see IConnector#getState()
* @author Eike Stepper
- * @since 0.8.0
*/
public enum ConnectorState
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java
index 78a465b..b75b389 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java
@@ -46,7 +46,6 @@ import java.util.List;
* SHAPE="RECT" COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> </MAP>
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IAcceptor extends IContainer<IConnector>
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java
index 89c3da6..40bc889 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java
@@ -94,7 +94,6 @@ import java.nio.channels.SocketChannel;
* @see IBufferHandler#handleBuffer(IBuffer)
* @see Buffer
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IBuffer
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java
index 05d6ccf..60ebe62 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* Provides clients with the ability to pass {@link IBuffer}s in for further buffer handling.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IBufferHandler
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java
index 9659d03..f40d918 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* Provides clients with the ability to obtain and retain pooled {@link IBuffer}s.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IBufferPool extends IBufferProvider
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java
index f8ab38f..2ffb075 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* Provides clients with the ability to obtain and retain {@link IBuffer}s.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IBufferProvider
{
@@ -37,7 +36,6 @@ public interface IBufferProvider
* Offers additional introspection features for {@link IBufferProvider}s.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface Introspection extends IBufferProvider
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java
index db8d6dc..28240d6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java
@@ -80,7 +80,6 @@ import org.eclipse.net4j.util.event.INotifier;
* </pre>
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IChannel extends IBufferHandler, INotifier
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java
index 5dcaf22..e3c345a 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* An identifier of an {@link IChannel} that is unique among all channels of all {@link IConnector}s.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IChannelID
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java
index 68696f8..cede42f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java
@@ -51,7 +51,6 @@ import java.util.List;
* COORDS="818,195,897,222" HREF="IProtocol.html"> </MAP>
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IConnector extends IContainer<IChannel>
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java
index fc6a008..99d0a08 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java
@@ -12,7 +12,6 @@ package org.eclipse.net4j;
/**
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IConnectorCredentials
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java
index 70a7143..b5cee37 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.util.event.IEvent;
* An event that is fired by an {@link IConnector}.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IConnectorEvent extends IEvent
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java
index cf44cc6..c2136fe 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* Provides the ability to execute a negotitation phase between two connectors.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IConnectorNegotiator
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
index 6e87e76..4fc4e50 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
@@ -14,7 +14,6 @@ package org.eclipse.net4j;
* An event that is fired by an {@link IConnector} to indicate that its state has changed.
*
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IConnectorStateEvent extends IConnectorEvent
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
index bdb381b..6714227 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
@@ -12,7 +12,6 @@ package org.eclipse.net4j;
/**
* @author Eike Stepper
- * @since 0.8.0
*/
public interface IProtocol extends IBufferHandler
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
index 80cfa19..bcecf1c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ExecutorService;
/**
* @author Eike Stepper
- * @since 0.8.0
*/
public final class Net4jUtil
{