[282481] Provide an EmbeddedSessionProtocol

https://bugs.eclipse.org/bugs/show_bug.cgi?id=282481

3 files changed, 9 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidURIException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidURIException.java
index 928cd87854..a735eb40cc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidURIException.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/InvalidURIException.java
@@ -4,7 +4,7 @@
  * 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:
  *    Eike Stepper - initial API and implementation
  */
@@ -30,7 +30,7 @@ public class InvalidURIException extends CDOException
 
   public InvalidURIException(URI uri, Throwable cause)
   {
-    super(MessageFormat.format(Messages.getString("InvalidURIException.0"), uri, cause)); //$NON-NLS-1$
+    super(MessageFormat.format(Messages.getString("InvalidURIException.0"), uri, cause), cause); //$NON-NLS-1$
     this.uri = uri;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 314d002bc7..ad12afc7b8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -704,12 +704,6 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
   }
 
   @Override
-  protected void doBeforeActivate() throws Exception
-  {
-    super.doBeforeActivate();
-  }
-
-  @Override
   protected void doActivate() throws Exception
   {
     super.doActivate();
@@ -1357,14 +1351,15 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
       }
     }
 
-    public List<Object> query(int viewID, AbstractQueryIterator<?> queryResult)
+    public void query(int viewID, AbstractQueryIterator<?> queryResult)
     {
       int attempt = 0;
       for (;;)
       {
         try
         {
-          return delegate.query(viewID, queryResult);
+          delegate.query(viewID, queryResult);
+          return;
         }
         catch (Exception ex)
         {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index 3993eefe78..121bf4d832 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -81,7 +81,10 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, Revision
 
   public void changeSubscription(int viewId, List<CDOID> cdoIDs, boolean subscribeMode, boolean clear);
 
-  public List<Object> query(int viewID, AbstractQueryIterator<?> queryResult);
+  /**
+   * @since 3.0
+   */
+  public void query(int viewID, AbstractQueryIterator<?> queryResult);
 
   public boolean cancelQuery(int queryId);