1 files changed, 303 insertions, 303 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionImpl.java
index 6e15530506..412c049944 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/RecoveringCDOSessionImpl.java
@@ -1,303 +1,303 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * 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:
- *    Caspar De Groot - initial API and implementation
- */
-package org.eclipse.emf.cdo.internal.net4j;
-
-import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
-import org.eclipse.emf.cdo.common.util.TransportException;
-import org.eclipse.emf.cdo.net4j.CDOSessionRecoveryEvent;
-import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.session.CDOSessionEvent;
-import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
-import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
-import org.eclipse.emf.cdo.spi.common.commit.InternalCDOCommitInfoManager;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.signal.heartbeat.HeartBeatProtocol;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
-import org.eclipse.emf.spi.cdo.InternalCDOView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Caspar De Groot
- */
-public abstract class RecoveringCDOSessionImpl extends CDONet4jSessionImpl
-{
-  private IManagedContainer container;
-
-  private String repositoryConnectorDescription;
-
-  private boolean useHeartBeat;
-
-  private long heartBeatPeriod = 1000L;
-
-  private long heartBeatTimeout = 5000L;
-
-  private long connectorTimeout = 10000L;
-
-  public RecoveringCDOSessionImpl()
-  {
-    setExceptionHandler(new RecoveringExceptionHandler());
-  }
-
-  public long getConnectorTimeout()
-  {
-    return connectorTimeout;
-  }
-
-  public void setConnectorTimeout(long connectorTimeout)
-  {
-    this.connectorTimeout = connectorTimeout;
-  }
-
-  public void setContainer(IManagedContainer container)
-  {
-    this.container = container;
-  }
-
-  public IManagedContainer getContainer()
-  {
-    return container;
-  }
-
-  public void setUseHeartBeat(boolean useHeartBeat)
-  {
-    this.useHeartBeat = useHeartBeat;
-  }
-
-  public boolean getUseHeartBeat()
-  {
-    return useHeartBeat;
-  }
-
-  public void setHeartBeatTimeout(long timeout)
-  {
-    heartBeatTimeout = timeout;
-  }
-
-  public long getHeartBeatTimeout()
-  {
-    return heartBeatTimeout;
-  }
-
-  public void setHeartBeatPeriod(long period)
-  {
-    heartBeatPeriod = period;
-  }
-
-  public long getHeartBeatPeriod()
-  {
-    return heartBeatPeriod;
-  }
-
-  @Override
-  protected void sessionProtocolDeactivated()
-  {
-    recover();
-  }
-
-  protected void recover()
-  {
-    fireEvent(createRecoveryStartedEvent());
-
-    CDOSessionProtocol oldSessionProtocol = getSessionProtocol();
-    unhookSessionProtocol();
-    List<AfterRecoveryRunnable> runnables = recoverSession();
-
-    // Check if the the sessionProtocol was replaced. (This may not be the case
-    // if the protocol is wrapped inside a DelegatingSessionProtocol.)
-    //
-    CDOSessionProtocol newSessionProtocol = getSessionProtocol();
-    if (newSessionProtocol != oldSessionProtocol)
-    {
-      handleProtocolChange(oldSessionProtocol, newSessionProtocol);
-    }
-
-    for (AfterRecoveryRunnable runnable : runnables)
-    {
-      runnable.run(newSessionProtocol);
-    }
-
-    fireEvent(createRecoveryFinishedEvent());
-  }
-
-  protected void handleProtocolChange(CDOSessionProtocol oldProtocol, CDOSessionProtocol newProtocol)
-  {
-    // The revisionManager, branchManager, and commitInfoManager, hold their own
-    // references to the sessionProtocol. We need to update those:
-
-    InternalCDORevisionManager revisionManager = getRevisionManager();
-    revisionManager.deactivate();
-    revisionManager.setRevisionLoader(newProtocol);
-    revisionManager.activate();
-
-    InternalCDOBranchManager branchManager = getBranchManager();
-    branchManager.deactivate();
-    branchManager.setBranchLoader(newProtocol);
-    branchManager.activate();
-
-    InternalCDOCommitInfoManager commitInfoManager = getCommitInfoManager();
-    commitInfoManager.deactivate();
-    commitInfoManager.setCommitInfoLoader(newProtocol);
-    commitInfoManager.activate();
-  }
-
-  protected CDOSessionEvent createRecoveryStartedEvent()
-  {
-    return new CDOSessionRecoveryEventImpl(this, CDOSessionRecoveryEvent.Type.STARTED);
-  }
-
-  protected CDOSessionEvent createRecoveryFinishedEvent()
-  {
-    return new CDOSessionRecoveryEventImpl(this, CDOSessionRecoveryEvent.Type.FINISHED);
-  }
-
-  protected IConnector createTCPConnector(boolean heartBeat)
-  {
-    IConnector connector = getTCPConnector(repositoryConnectorDescription);
-    if (heartBeat)
-    {
-      new HeartBeatProtocol(connector, container).start(heartBeatPeriod, heartBeatTimeout);
-    }
-
-    connector.addListener(new AutoCloser());
-    return connector;
-  }
-
-  protected IConnector getTCPConnector(String description)
-  {
-    return Net4jUtil.getConnector(getContainer(), "tcp", description, connectorTimeout);
-  }
-
-  protected List<AfterRecoveryRunnable> recoverSession()
-  {
-    try
-    {
-      List<AfterRecoveryRunnable> runnables = new ArrayList<AfterRecoveryRunnable>();
-      for (InternalCDOView view : getViews())
-      {
-        runnables.add(new OpenViewRunnable(view));
-      }
-
-      updateConnectorAndRepositoryName();
-      openSession();
-
-      return runnables;
-    }
-    catch (RuntimeException ex)
-    {
-      deactivate();
-      throw ex;
-    }
-    catch (Error ex)
-    {
-      deactivate();
-      throw ex;
-    }
-  }
-
-  protected IConnector removeTCPConnector()
-  {
-    return (IConnector)container.removeElement("org.eclipse.net4j.connectors", "tcp", repositoryConnectorDescription);
-  }
-
-  protected void setRepositoryConnectorDescription(String description)
-  {
-    repositoryConnectorDescription = description;
-  }
-
-  protected String getRepositoryConnectorDescription()
-  {
-    return repositoryConnectorDescription;
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    updateConnectorAndRepositoryName();
-    super.doActivate();
-  }
-
-  protected abstract void updateConnectorAndRepositoryName();
-
-  /**
-   * @author Eike Stepper
-   */
-  public static interface AfterRecoveryRunnable
-  {
-    public void run(CDOSessionProtocol sessionProtocol);
-  }
-
-  private class RecoveringExceptionHandler implements ExceptionHandler
-  {
-    public void handleException(CDOSession session, int attempt, Exception exception) throws Exception
-    {
-      if (exception instanceof TransportException)
-      {
-        recover();
-      }
-    }
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  public final class OpenViewRunnable implements AfterRecoveryRunnable
-  {
-    private int viewID;
-
-    private CDOBranchPoint branchPoint;
-
-    private boolean transaction;
-
-    public OpenViewRunnable(InternalCDOView view)
-    {
-      viewID = view.getViewID();
-      branchPoint = CDOBranchUtil.copyBranchPoint(view);
-      transaction = view instanceof CDOTransaction;
-    }
-
-    public void run(CDOSessionProtocol sessionProtocol)
-    {
-      sessionProtocol.openView(viewID, !transaction, branchPoint);
-    }
-  }
-
-  private static class AutoCloser implements IListener
-  {
-    public void notifyEvent(IEvent event)
-    {
-      if (event instanceof IContainerEvent<?>)
-      {
-        IContainerEvent<?> containerEvent = (IContainerEvent<?>)event;
-        if (containerEvent.getDelta().getKind() == IContainerDelta.Kind.REMOVED)
-        {
-          IConnector connector = (IConnector)event.getSource();
-          if (connector.getChannels().size() == 0)
-          {
-            LifecycleUtil.deactivate(connector);
-          }
-        }
-      }
-    }
-  }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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:
+ *    Caspar De Groot - initial API and implementation
+ */
+package org.eclipse.emf.cdo.internal.net4j;
+
+import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.common.util.TransportException;
+import org.eclipse.emf.cdo.net4j.CDOSessionRecoveryEvent;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.session.CDOSessionEvent;
+import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
+import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
+import org.eclipse.emf.cdo.spi.common.commit.InternalCDOCommitInfoManager;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+
+import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.connector.IConnector;
+import org.eclipse.net4j.signal.heartbeat.HeartBeatProtocol;
+import org.eclipse.net4j.util.container.IContainerDelta;
+import org.eclipse.net4j.util.container.IContainerEvent;
+import org.eclipse.net4j.util.container.IManagedContainer;
+import org.eclipse.net4j.util.event.IEvent;
+import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+
+import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
+import org.eclipse.emf.spi.cdo.InternalCDOView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Caspar De Groot
+ */
+public abstract class RecoveringCDOSessionImpl extends CDONet4jSessionImpl
+{
+  private IManagedContainer container;
+
+  private String repositoryConnectorDescription;
+
+  private boolean useHeartBeat;
+
+  private long heartBeatPeriod = 1000L;
+
+  private long heartBeatTimeout = 5000L;
+
+  private long connectorTimeout = 10000L;
+
+  public RecoveringCDOSessionImpl()
+  {
+    setExceptionHandler(new RecoveringExceptionHandler());
+  }
+
+  public long getConnectorTimeout()
+  {
+    return connectorTimeout;
+  }
+
+  public void setConnectorTimeout(long connectorTimeout)
+  {
+    this.connectorTimeout = connectorTimeout;
+  }
+
+  public void setContainer(IManagedContainer container)
+  {
+    this.container = container;
+  }
+
+  public IManagedContainer getContainer()
+  {
+    return container;
+  }
+
+  public void setUseHeartBeat(boolean useHeartBeat)
+  {
+    this.useHeartBeat = useHeartBeat;
+  }
+
+  public boolean getUseHeartBeat()
+  {
+    return useHeartBeat;
+  }
+
+  public void setHeartBeatTimeout(long timeout)
+  {
+    heartBeatTimeout = timeout;
+  }
+
+  public long getHeartBeatTimeout()
+  {
+    return heartBeatTimeout;
+  }
+
+  public void setHeartBeatPeriod(long period)
+  {
+    heartBeatPeriod = period;
+  }
+
+  public long getHeartBeatPeriod()
+  {
+    return heartBeatPeriod;
+  }
+
+  @Override
+  protected void sessionProtocolDeactivated()
+  {
+    recover();
+  }
+
+  protected void recover()
+  {
+    fireEvent(createRecoveryStartedEvent());
+
+    CDOSessionProtocol oldSessionProtocol = getSessionProtocol();
+    unhookSessionProtocol();
+    List<AfterRecoveryRunnable> runnables = recoverSession();
+
+    // Check if the the sessionProtocol was replaced. (This may not be the case
+    // if the protocol is wrapped inside a DelegatingSessionProtocol.)
+    //
+    CDOSessionProtocol newSessionProtocol = getSessionProtocol();
+    if (newSessionProtocol != oldSessionProtocol)
+    {
+      handleProtocolChange(oldSessionProtocol, newSessionProtocol);
+    }
+
+    for (AfterRecoveryRunnable runnable : runnables)
+    {
+      runnable.run(newSessionProtocol);
+    }
+
+    fireEvent(createRecoveryFinishedEvent());
+  }
+
+  protected void handleProtocolChange(CDOSessionProtocol oldProtocol, CDOSessionProtocol newProtocol)
+  {
+    // The revisionManager, branchManager, and commitInfoManager, hold their own
+    // references to the sessionProtocol. We need to update those:
+
+    InternalCDORevisionManager revisionManager = getRevisionManager();
+    revisionManager.deactivate();
+    revisionManager.setRevisionLoader(newProtocol);
+    revisionManager.activate();
+
+    InternalCDOBranchManager branchManager = getBranchManager();
+    branchManager.deactivate();
+    branchManager.setBranchLoader(newProtocol);
+    branchManager.activate();
+
+    InternalCDOCommitInfoManager commitInfoManager = getCommitInfoManager();
+    commitInfoManager.deactivate();
+    commitInfoManager.setCommitInfoLoader(newProtocol);
+    commitInfoManager.activate();
+  }
+
+  protected CDOSessionEvent createRecoveryStartedEvent()
+  {
+    return new CDOSessionRecoveryEventImpl(this, CDOSessionRecoveryEvent.Type.STARTED);
+  }
+
+  protected CDOSessionEvent createRecoveryFinishedEvent()
+  {
+    return new CDOSessionRecoveryEventImpl(this, CDOSessionRecoveryEvent.Type.FINISHED);
+  }
+
+  protected IConnector createTCPConnector(boolean heartBeat)
+  {
+    IConnector connector = getTCPConnector(repositoryConnectorDescription);
+    if (heartBeat)
+    {
+      new HeartBeatProtocol(connector, container).start(heartBeatPeriod, heartBeatTimeout);
+    }
+
+    connector.addListener(new AutoCloser());
+    return connector;
+  }
+
+  protected IConnector getTCPConnector(String description)
+  {
+    return Net4jUtil.getConnector(getContainer(), "tcp", description, connectorTimeout);
+  }
+
+  protected List<AfterRecoveryRunnable> recoverSession()
+  {
+    try
+    {
+      List<AfterRecoveryRunnable> runnables = new ArrayList<AfterRecoveryRunnable>();
+      for (InternalCDOView view : getViews())
+      {
+        runnables.add(new OpenViewRunnable(view));
+      }
+
+      updateConnectorAndRepositoryName();
+      openSession();
+
+      return runnables;
+    }
+    catch (RuntimeException ex)
+    {
+      deactivate();
+      throw ex;
+    }
+    catch (Error ex)
+    {
+      deactivate();
+      throw ex;
+    }
+  }
+
+  protected IConnector removeTCPConnector()
+  {
+    return (IConnector)container.removeElement("org.eclipse.net4j.connectors", "tcp", repositoryConnectorDescription);
+  }
+
+  protected void setRepositoryConnectorDescription(String description)
+  {
+    repositoryConnectorDescription = description;
+  }
+
+  protected String getRepositoryConnectorDescription()
+  {
+    return repositoryConnectorDescription;
+  }
+
+  @Override
+  protected void doActivate() throws Exception
+  {
+    updateConnectorAndRepositoryName();
+    super.doActivate();
+  }
+
+  protected abstract void updateConnectorAndRepositoryName();
+
+  /**
+   * @author Eike Stepper
+   */
+  public static interface AfterRecoveryRunnable
+  {
+    public void run(CDOSessionProtocol sessionProtocol);
+  }
+
+  private class RecoveringExceptionHandler implements ExceptionHandler
+  {
+    public void handleException(CDOSession session, int attempt, Exception exception) throws Exception
+    {
+      if (exception instanceof TransportException)
+      {
+        recover();
+      }
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  public final class OpenViewRunnable implements AfterRecoveryRunnable
+  {
+    private int viewID;
+
+    private CDOBranchPoint branchPoint;
+
+    private boolean transaction;
+
+    public OpenViewRunnable(InternalCDOView view)
+    {
+      viewID = view.getViewID();
+      branchPoint = CDOBranchUtil.copyBranchPoint(view);
+      transaction = view instanceof CDOTransaction;
+    }
+
+    public void run(CDOSessionProtocol sessionProtocol)
+    {
+      sessionProtocol.openView(viewID, !transaction, branchPoint);
+    }
+  }
+
+  private static class AutoCloser implements IListener
+  {
+    public void notifyEvent(IEvent event)
+    {
+      if (event instanceof IContainerEvent<?>)
+      {
+        IContainerEvent<?> containerEvent = (IContainerEvent<?>)event;
+        if (containerEvent.getDelta().getKind() == IContainerDelta.Kind.REMOVED)
+        {
+          IConnector connector = (IConnector)event.getSource();
+          if (connector.getChannels().size() == 0)
+          {
+            LifecycleUtil.deactivate(connector);
+          }
+        }
+      }
+    }
+  }
+}