Skip to content

Commit

Permalink
Merge branch 'release/3.5.2' into support/3.x
Browse files Browse the repository at this point in the history
* release/3.5.2:
  Updated dependencies for 3.5.2
  MDUMLCS-29045 Resolved high CPU usage at idle by mitigating JDK-8129861 bug.
  Added TODO for branch checking
  Updated version info for 3.5.2
  • Loading branch information
ivan-gomes committed Sep 7, 2018
2 parents ad0277a + 565074e commit e61f373
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ dependencies {
// Other dependencies we're unable to resolve via standard repositories

if (buildAccess == 'internal') {
preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.5.1', ext: 'zip'
preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.5.2', ext: 'zip'
}
else {
preCompile group: 'com.nomagic', name: 'magicdraw', version: '185sp3', classifier: 'MagicDraw_185_sp3_no_install', ext: 'zip'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.5.1
version=3.5.2
group=org.openmbee.magicdraw.mdk
descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ public synchronized boolean update() throws URISyntaxException, IOException, Ser
if (!project.isRemote()) {
return false;
}
// TODO test if branch exists to avoid 404 on commits GET
if (!TicketUtils.isTicketSet(project)) {
inMemoryCommits.clear();
inMemoryChangelog.clear();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gov/nasa/jpl/mbee/mdk/util/TaskRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import java.util.function.BiFunction;

public class TaskRunner {
private static final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(0);
// Cannot set corePoolSize to 0 due to bug that causes high CPU usage https://bugs.openjdk.java.net/browse/JDK-8129861
private static final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);

public static Future<?> runWithProgressStatus(Runnable runnable, String title, ThreadExecutionStrategy strategy) {
return runWithProgressStatus(runnable, title, strategy, false);
Expand Down

0 comments on commit e61f373

Please sign in to comment.