Skip to content

Replace unambiguous of throw Throwables.propagate with definition #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kennknowles wants to merge 2 commits into from
Closed

Replace unambiguous of throw Throwables.propagate with definition #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a8a3d4
Replace unambiguous of `throw Throwables.propagate` with definition
kennknowles Mar 23, 2016
5ff607e
Re-interrupt thread when handling InterruptedException
kennknowles Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ static synchronized <T extends PipelineOptions> Registration<T> validateWellForm
COMBINED_CACHE.put(combinedPipelineOptionsInterfaces,
new Registration<T>(allProxyClass, propertyDescriptors));
} catch (IntrospectionException e) {
throw Throwables.propagate(e);
throw new RuntimeException(e);
}
}

Expand All @@ -617,7 +617,7 @@ static synchronized <T extends PipelineOptions> Registration<T> validateWellForm
INTERFACE_CACHE.put(iface,
new Registration<T>(proxyClass, propertyDescriptors));
} catch (IntrospectionException e) {
throw Throwables.propagate(e);
throw new RuntimeException(e);
}
}
@SuppressWarnings("unchecked")
Expand Down
3 changes: 1 addition & 2 deletions ...a/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.google.cloud.dataflow.sdk.values.PInput;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator;
Expand Down Expand Up @@ -75,7 +74,7 @@ public PCollection<T> apply(PInput input) {
try {
source = new InMemorySource<>(original.getElements(), elementCoder);
} catch (IOException e) {
throw Throwables.propagate(e);
throw new RuntimeException(e);
}
PCollection<T> result = input.getPipeline().apply(Read.from(source));
result.setCoder(elementCoder);
Expand Down
3 changes: 1 addition & 2 deletions sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetectors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.google.cloud.dataflow.sdk.coders.Coder;
import com.google.cloud.dataflow.sdk.coders.CoderException;
import com.google.common.base.Throwables;

import java.util.Arrays;
import java.util.Objects;
Expand Down Expand Up @@ -113,7 +112,7 @@ public void verifyUnmodified() {
try {
verifyUnmodifiedThrowingCheckedExceptions();
} catch (CoderException exn) {
Throwables.propagate(exn);
throw new RuntimeException(exn);
}
}

Expand Down
4 changes: 1 addition & 3 deletions ...ava/core/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud.dataflow.sdk.testing;

import com.google.common.base.Throwables;

import org.junit.rules.ExternalResource;
import org.junit.rules.TestRule;

Expand Down Expand Up @@ -45,7 +43,7 @@ protected void after() {
System.getProperties().clear();
System.getProperties().load(bais);
} catch (IOException e) {
throw Throwables.propagate(e);
throw new RuntimeException(e);
}
}
}
29 changes: 15 additions & 14 deletions sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GcsUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import com.google.cloud.dataflow.sdk.util.gcsfs.GcsPath;
import com.google.cloud.hadoop.gcsio.GoogleCloudStorageReadChannel;
import com.google.cloud.hadoop.util.ClientRequestHelper;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;

import org.junit.Rule;
Expand Down Expand Up @@ -141,20 +140,22 @@ public void testMultipleThreadsCanCompleteOutOfOrderWithDefaultThreadPool() thro
for (int i = 0; i < numThreads; i++) {
final int currentLatch = i;
countDownLatches[i] = new CountDownLatch(1);
executorService.execute(new Runnable() {
@Override
public void run() {
// Wait for latch N and then release latch N - 1
try {
countDownLatches[currentLatch].await();
if (currentLatch > 0) {
countDownLatches[currentLatch - 1].countDown();
executorService.execute(
new Runnable() {
@Override
public void run() {
// Wait for latch N and then release latch N - 1
try {
countDownLatches[currentLatch].await();
if (currentLatch > 0) {
countDownLatches[currentLatch - 1].countDown();
}
} catch (InterruptedException e) {
Copy link
Member

@lukecwik lukecwik Mar 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add Thread.currentThread().interrupt() before the throws

Copy link
Member Author

@kennknowles kennknowles Mar 31, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. (just below the diff)

Thread.currentThread().interrupt();
throw new RuntimeException(e);
}
}
} catch (InterruptedException e) {
throw Throwables.propagate(e);
}
}
});
});
}

// Release the last latch starting the chain reaction.
Expand Down