Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Watson2014-07-09 15:43:02 +0000
committerGreg Watson2014-07-09 15:43:02 +0000
commit5519272fdec27723f82649128ed5245744a38c90 (patch)
treed747de1fd5eb6af28c52102b1f1f4c979a2ad17b
parent8fa958ace35aa0b1d24d915642fed4682ff4f5cb (diff)
parente555694ab9ad763f2277202dc851a05802e7a4ee (diff)
downloadorg.eclipse.ptp-5519272fdec27723f82649128ed5245744a38c90.tar.gz
org.eclipse.ptp-5519272fdec27723f82649128ed5245744a38c90.tar.xz
org.eclipse.ptp-5519272fdec27723f82649128ed5245744a38c90.zip
Merge remote-tracking branch 'origin/ptp_8_0'
Change-Id: Ic88864f63601753ce696785ffd5f9e1fbb7b7ce1 Signed-off-by: Greg Watson <g.watson@computer.org>
-rw-r--r--core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/AbstractParallelLaunchConfigurationDelegate.java12
-rw-r--r--pom.xml10
2 files changed, 11 insertions, 11 deletions
diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/AbstractParallelLaunchConfigurationDelegate.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/AbstractParallelLaunchConfigurationDelegate.java
index 1cdc65f7a..cf4dfcc91 100644
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/AbstractParallelLaunchConfigurationDelegate.java
+++ b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/AbstractParallelLaunchConfigurationDelegate.java
@@ -145,40 +145,40 @@ public abstract class AbstractParallelLaunchConfigurationDelegate extends Launch
protected IStatus run(IProgressMonitor monitor) {
SubMonitor subMon = SubMonitor.convert(monitor, 100);
String jobId = fLaunch.getJobId();
- fSubLock.lock();
try {
while (fLaunchControl.getJobStatus(jobId, subMon.newChild(50)).getState().equals(IJobStatus.SUBMITTED)
&& !subMon.isCanceled()) {
+ fSubLock.lock();
try {
fSubCondition.await(500, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
// Expect to be interrupted if monitor is canceled
+ } finally {
+ fSubLock.unlock();
}
}
} catch (CoreException e) {
// Ignore
- } finally {
- fSubLock.unlock();
}
if (!subMon.isCanceled()) {
doCompleteJobLaunch(fLaunch, fDebugger);
- fSubLock.lock();
try {
while (!fLaunchControl.getJobStatus(jobId, subMon.newChild(50)).getState().equals(IJobStatus.COMPLETED)
&& !subMon.isCanceled()) {
+ fSubLock.lock();
try {
fSubCondition.await(1000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
// Expect to be interrupted if monitor is
// canceled
+ } finally {
+ fSubLock.unlock();
}
}
} catch (CoreException e) {
// Ignore
- } finally {
- fSubLock.unlock();
}
if (!subMon.isCanceled()) {
diff --git a/pom.xml b/pom.xml
index b0f6d73a3..1beca3062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,10 @@
<eclipse-release>luna</eclipse-release>
<tycho-version>0.19.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <platform-site>http://download.eclipse.org/eclipse/updates/4.4milestones/S-4.4RC2-201405221330</platform-site>
- <tm-site>http://download.eclipse.org/tm/updates/3.6milestones/RC1</tm-site>
- <cdt-site>http://download.eclipse.org/tools/cdt/builds/${eclipse-release}/milestones/rc2</cdt-site>
- <egit-site>http://download.eclipse.org/egit/staging/v3.4.0.201405211411-rc1</egit-site>
+ <platform-site>http://download.eclipse.org/eclipse/updates/4.4/R-4.4-201406061215</platform-site>
+ <tm-site>http://download.eclipse.org/tm/updates/3.6milestones/RC4</tm-site>
+ <cdt-site>http://download.eclipse.org/tools/cdt/builds/${eclipse-release}/milestones/rc4b</cdt-site>
+ <egit-site>http://download.eclipse.org/egit/updates-3.4.1</egit-site>
<photran-site>http://download.eclipse.org/tools/ptp/builds/hudson/ptp-release-photran</photran-site>
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/${eclipse-release}/milestones/RC4</remote-site>
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
@@ -192,7 +192,7 @@
<repositories>
<repository>
- <id>platform-$eclipse-release}</id>
+ <id>platform-${eclipse-release}</id>
<url>${platform-site}</url>
<layout>p2</layout>
</repository>

Back to the top