diff options
author | Eike Stepper | 2011-08-17 18:58:17 +0000 |
---|---|---|
committer | Eike Stepper | 2011-08-17 18:58:17 +0000 |
commit | 1cc1db360c1864c2ef0fde483555a12853c36516 (patch) | |
tree | 54f5cee2a810db524392d5f7ddbc9b92f4b6a391 /plugins/org.eclipse.emf.cdo.server.net4j | |
parent | af743ca2ac4200e4b9a719b1528d9f4797cfa101 (diff) | |
download | cdo-1cc1db360c1864c2ef0fde483555a12853c36516.tar.gz cdo-1cc1db360c1864c2ef0fde483555a12853c36516.tar.xz cdo-1cc1db360c1864c2ef0fde483555a12853c36516.zip |
[354963] handleRevisions() does not work correctly for sub branches
https://bugs.eclipse.org/bugs/show_bug.cgi?id=354963
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java index 506317d098..e736ea5a2b 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java @@ -93,28 +93,29 @@ public class HandleRevisionsIndication extends CDOServerReadIndication final IOException[] ioException = { null }; final RuntimeException[] runtimeException = { null }; - getRepository().handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, new CDORevisionHandler() - { - public boolean handleRevision(CDORevision revision) - { - try - { - out.writeBoolean(true); - out.writeCDORevision(revision, CDORevision.UNCHUNKED); - return true; - } - catch (IOException ex) + getRepository().handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, + new CDORevisionHandler.Filtered.Undetached(new CDORevisionHandler() { - ioException[0] = ex; - } - catch (RuntimeException ex) - { - runtimeException[0] = ex; - } - - return false; - } - }); + public boolean handleRevision(CDORevision revision) + { + try + { + out.writeBoolean(true); + out.writeCDORevision(revision, CDORevision.UNCHUNKED); + return true; + } + catch (IOException ex) + { + ioException[0] = ex; + } + catch (RuntimeException ex) + { + runtimeException[0] = ex; + } + + return false; + } + })); if (ioException[0] != null) { |