Skip to content

Fix ScheduledSingleThreadExecutor.awaitTermination exception for nano time calculation error #319

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

Open
MapleMaster wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix ScheduledSingleThreadExecutor.awaitTermination exception for nano time calculation error #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
222762f
Fix ScheduledSingleThreadExecutor.awaitTermination exception for nano…
Dec 6, 2018
6b8bb4e
Fix JMXFibersMonitor.getNumRunnableFibers throw null pointer exception
Dec 8, 2018
fba615d
Fix JMXFibersMonitor.getNumRunnableFibers throw null pointer exception
Dec 8, 2018
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 ...core/src/main/java/co/paralleluniverse/concurrent/util/ScheduledSingleThreadExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ public List<Runnable> shutdownNow() {
public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
long nanos = unit.toNanos(timeout);
long millis = TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS);
worker.join(millis, (int) (nanos - millis));
worker.join(millis, (int) (nanos - millis * 1000000));
return !worker.isAlive();
}

Expand Down Expand Up @@ -742,4 +742,4 @@ public int getPoolSize() {
public int getActiveCount() {
return 1;
}
}
}
3 changes: 3 additions & 0 deletions quasar-core/src/main/java/co/paralleluniverse/fibers/JMXFibersMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ else if (t.getState() == Thread.State.RUNNABLE)
@Override
public Map<String, String> getRunawayFibers() {
Map<String, String> map = new HashMap<>();
if (problemFibers == null) {
return map;
}
for (Map.Entry<Fiber, StackTraceElement[]> e : problemFibers.entrySet())
map.put(e.getKey().toString(), Strand.toString(e.getValue()));
return map;
Expand Down