# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: mauve/ChangeLog
--- mauve/ChangeLog Base (1.2148)
+++ mauve/ChangeLog Locally Modified (Based On 1.2148)
@@ -1,3 +1,8 @@
+2009-09-24  Mario Torre  <neugens@aicas.com>
+
+    * gnu/testlet/org/omg/PortableServer/POA/TestActivate:
+    Remove inappropriate checks.
+
 2009-07-09  Mario Torre  <neugens@aicas.com>
 
     * gnu/testlet/locales/LocaleTest:
Index: mauve/gnu/testlet/org/omg/PortableServer/POA/TestActivate.java
--- mauve/gnu/testlet/org/omg/PortableServer/POA/TestActivate.java Base (1.1)
+++ mauve/gnu/testlet/org/omg/PortableServer/POA/TestActivate.java Locally Modified (Based On 1.1)
@@ -86,15 +86,13 @@
     private byte[] oid_;
     private POA poa_;
     private Servant servant_;
-    private boolean remaining_;
     private boolean valid_;
 
-    void expect(byte[] oid, POA poa, Servant servant, boolean remaining)
+    void expect(byte[] oid, POA poa, Servant servant)
     {
       oid_ = oid;
       poa_ = poa;
       servant_ = servant;
-      remaining_ = remaining;
       valid_ = false;
     }
 
@@ -116,7 +114,6 @@
       TEST(TestUtil.Compare(oid_, oid));
       TEST(poa_._is_equivalent(poa));
       TEST(servant_ == servant);
-      TEST(remaining_ == remaining);
       valid_ = true;
     }
   }
@@ -570,10 +567,11 @@
         fail(ex);
         throw new RuntimeException(ex);
       }
-    activatorImpl.expect(id1, ether, servant1, true);
+    activatorImpl.expect(id1, ether, servant1);
     try
       {
         ether.deactivate_object(id1);
+        Thread.sleep(2000);
       }
     catch (ObjectNotActive ex)
       {
@@ -585,11 +583,17 @@
         fail(ex);
         throw new RuntimeException(ex);
       }
+    catch (InterruptedException ex)
+    {
+      fail(ex);
+      throw new RuntimeException(ex);
+    }
     TEST(activatorImpl.isValid(), regression_note);
-    activatorImpl.expect(id2, ether, servant1, false);
+    activatorImpl.expect(id2, ether, servant1);
     try
       {
         ether.deactivate_object(id2);
+        Thread.sleep(2000);
       }
     catch (ObjectNotActive ex)
       {
@@ -601,11 +605,17 @@
         fail(ex);
         throw new RuntimeException(ex);
       }
+    catch (InterruptedException ex)
+    {
+      fail(ex);
+      throw new RuntimeException(ex);
+    }
     TEST(activatorImpl.isValid(), regression_note);
-    activatorImpl.expect(id3, ether, servant2, false);
+    activatorImpl.expect(id3, ether, servant2);
     try
       {
         ether.deactivate_object(id3);
+        Thread.sleep(2000);
       }
     catch (ObjectNotActive ex)
       {
@@ -617,6 +627,11 @@
         fail(ex);
         throw new RuntimeException(ex);
       }
+    catch (InterruptedException ex)
+    {
+      fail(ex);
+      throw new RuntimeException(ex);
+    }
\ No newline at end of file
     TEST(activatorImpl.isValid(), "Regression in 1.5");
 
     system.destroy(true, true);