[213369] Exception handling

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

2 files changed, 11 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
index 3d52899b00..dff9edcc7e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java
@@ -12,17 +12,19 @@ package org.eclipse.emf.cdo.tests.bugzilla;
 
 import org.eclipse.emf.cdo.CDOSession;
 import org.eclipse.emf.cdo.CDOTransaction;
-import org.eclipse.emf.cdo.common.util.TransportException;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.tests.model1.Model1Factory;
 
+import org.eclipse.net4j.signal.SignalRemoteException;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 
-import java.util.concurrent.TimeoutException;
-
 /**
+ * Make timeouts in read-access requests configurable
+ * <p>
+ * See https://bugs.eclipse.org/241464
+ * 
  * @author Eike Stepper
  */
 public class Bugzilla_241464_Test extends AbstractCDOTest
@@ -54,14 +56,10 @@ public class Bugzilla_241464_Test extends AbstractCDOTest
     {
       Customer customer = (Customer)resource.getContents().get(0);
       System.out.println(customer.getName());
-      fail("TransportException expected");
+      fail("SignalRemoteException expected");
     }
-    catch (TransportException success)
+    catch (SignalRemoteException success)
     {
-      if (success.getCause().getClass() != TimeoutException.class)
-      {
-        fail("TimeoutException expected");
-      }
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
index 8a5644dabc..70e6e4fa2a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java
@@ -19,8 +19,11 @@ import org.eclipse.emf.cdo.tests.model1.Company;
 import org.eclipse.emf.cdo.tests.model1.Model1Factory;
 
 /**
+ * NPE during Transaction.getObject(id, false)
+ * <p>
+ * See https://bugs.eclipse.org/243310
+ * 
  * @author Eike Stepper
- * @see NPE during Transaction.getObject(id, false) https://bugs.eclipse.org/243310
  */
 public class Bugzilla_243310_Test extends AbstractCDOTest
 {