geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [01/50] [abbrv] incubator-geode git commit: Change join methods to not throw if timeout
Date Fri, 29 Apr 2016 19:23:11 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop b2f8e594c -> 72be65fff


Change join methods to not throw if timeout


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/06efab30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/06efab30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/06efab30

Branch: refs/heads/develop
Commit: 06efab30b847deb0addecf2f55df1df2d0bbb9e3
Parents: c41cd45
Author: Kirk Lund <klund@apache.org>
Authored: Tue Apr 12 10:23:25 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Tue Apr 12 10:23:25 2016 -0700

----------------------------------------------------------------------
 .../gemfire/test/dunit/AsyncInvocation.java     | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06efab30/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java
index d407934..441c48c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/AsyncInvocation.java
@@ -209,10 +209,10 @@ public class AsyncInvocation<T> {
    *
    * @return this {@code AsyncInvocation}
    *
-   * @throws AssertionError wrapping a {@code TimeoutException} if this
-   *         {@code AsyncInvocation} fails to complete within the specified
-   *         timeout of {@code millis}.
-   *
+//   * @throws AssertionError wrapping a {@code TimeoutException} if this
+//   *         {@code AsyncInvocation} fails to complete within the specified
+//   *         timeout of {@code millis}.
+//   *
    * @throws IllegalArgumentException if the value of {@code millis} is
    *         negative.
    *
@@ -220,7 +220,7 @@ public class AsyncInvocation<T> {
    */
   public synchronized AsyncInvocation<T> join(final long millis) throws InterruptedException
{
     this.thread.join(millis);
-    timeoutIfAlive(millis);
+//    timeoutIfAlive(millis);
     return this;
   }
 
@@ -235,10 +235,10 @@ public class AsyncInvocation<T> {
    *
    * @return this {@code AsyncInvocation}
    *
-   * @throws AssertionError wrapping a {@code TimeoutException} if this
-   *         {@code AsyncInvocation} fails to complete within the specified
-   *         timeout of {@code millis}.
-   *
+//   * @throws AssertionError wrapping a {@code TimeoutException} if this
+//   *         {@code AsyncInvocation} fails to complete within the specified
+//   *         timeout of {@code millis}.
+//   *
    * @throws IllegalArgumentException
    *         if the value of {@code millis} is negative, or the value
    *         of {@code nanos} is not in the range {@code 0-999999}.
@@ -247,7 +247,7 @@ public class AsyncInvocation<T> {
    */
   public synchronized AsyncInvocation<T> join(final long millis, final int nanos) throws
InterruptedException {
     this.thread.join(millis, nanos);
-    timeoutIfAlive(millis);
+//    timeoutIfAlive(millis);
     return this;
   }
 
@@ -257,16 +257,16 @@ public class AsyncInvocation<T> {
    *
    * @return this {@code AsyncInvocation}
    *
-   * @throws AssertionError wrapping a {@code TimeoutException} if this
-   *         {@code AsyncInvocation} fails to complete within the default
-   *         timeout of 60 seconds as defined by {@link #DEFAULT_JOIN_MILLIS}.
-   *
+//   * @throws AssertionError wrapping a {@code TimeoutException} if this
+//   *         {@code AsyncInvocation} fails to complete within the default
+//   *         timeout of 60 seconds as defined by {@link #DEFAULT_JOIN_MILLIS}.
+//   *
    * @throws InterruptedException if the current thread is interrupted.
    */
   public AsyncInvocation<T> join() throws InterruptedException {
     // do NOT invoke Thread#join() without a timeout
     join(DEFAULT_JOIN_MILLIS);
-    timeoutIfAlive(DEFAULT_JOIN_MILLIS);
+//    timeoutIfAlive(DEFAULT_JOIN_MILLIS);
     return this;
   }
 


Mime
View raw message