Description Lothar Werzinger 2010-12-15 14:00:53 EST

Build Identifier: 

I am trying to do a merge on branches (with a fake merger that does actually not even do anything) and I get a TimeoutException:

org.eclipse.emf.cdo.common.util.TransportException: java.util.concurrent.TimeoutException
	at org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocol.send(CDOClientProtocol.java:405)
	at org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocol.loadMergeData(CDOClientProtocol.java:359)
	at org.eclipse.emf.internal.cdo.transaction.CDOTransactionImpl.merge(CDOTransactionImpl.java:422)

Setting a hight timeout value helped (temporarily)

((org.eclipse.emf.cdo.net4j.CDOSession) transaction.getSession())
          .options().getProtocol().setTimeout(1000 * 600);


Here's my sample code snippet:

class FakeMerger
  implements
    CDOMerger
{
  public CDOChangeSet target;
  public CDOChangeSet source;

  @Override
  public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source)
  {
    this.target = target;
    this.source = source;
    
    // return null, and therefore do NOT do an actual merge
    return null;
  }
};
FakeMerger fakemerger = new FakeMerger();

CDOTransaction mergetransaction =
  transaction.getSession().openTransaction(testbranch);
mergetransaction.merge(mainbranch.getHead(), fakemerger);


Reproducible: Always

Steps to Reproduce:
1. run the above code.