diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map index 7e55d587ec5..59b9f451b60 100644 --- a/releng/org.eclipse.rse.build/maps/rse.map +++ b/releng/org.eclipse.rse.build/maps/rse.map @@ -21,7 +21,7 @@ plugin@org.eclipse.rse.sdk=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cv plugin@org.eclipse.rse.services.dstore=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore plugin@org.eclipse.rse.services.files.ftp=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp plugin@org.eclipse.rse.services.local=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local -plugin@org.eclipse.rse.services.ssh=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh +plugin@org.eclipse.rse.services.ssh=v20060811b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh plugin@org.eclipse.rse.services=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services plugin@org.eclipse.rse.shells.ui=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui plugin@org.eclipse.rse.subsystems.files.core=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core @@ -35,5 +35,5 @@ plugin@org.eclipse.rse.subsystems.processes.local=v20060811,:pserver:anonymous:n plugin@org.eclipse.rse.subsystems.shells.core=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core plugin@org.eclipse.rse.subsystems.shells.dstore=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore plugin@org.eclipse.rse.subsystems.shells.local=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local -plugin@org.eclipse.rse.subsystems.shells.ssh=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh +plugin@org.eclipse.rse.subsystems.shells.ssh=v20060811b,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh plugin@org.eclipse.rse.ui=v20060811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.services.ssh/.cvsignore b/rse/plugins/org.eclipse.rse.services.ssh/.cvsignore index ba077a4031a..e043cc4e2c0 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/.cvsignore +++ b/rse/plugins/org.eclipse.rse.services.ssh/.cvsignore @@ -1 +1,3 @@ bin +build.xml +javaCompiler...args diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java index c0fe462d37a..caa83a99044 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java @@ -75,13 +75,15 @@ public class Mutex { wait(timeLeft > pollTime ? pollTime : timeLeft); Activator.trace("Mutex: wakeup "+myself+" ?"); //$NON-NLS-1$ //$NON-NLS-2$ //I'm still in the list, nobody is allowed to take me out! - assert !fWaitQueue.isEmpty(); + //assert !fWaitQueue.isEmpty(); if (!fLocked && fWaitQueue.get(0) == myself) { break; //gee it's my turn! } long curTime = System.currentTimeMillis(); timeLeft = start + timeout - curTime; if (monitor!=null) { + //TODO put the calls to the progress monitor out + //of the synchronized{} canceled = monitor.isCanceled(); if (!canceled && (curTime>nextProgressUpdate)) { monitor.worked(1); diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java index 4911f5df92b..48386c80aae 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java @@ -150,7 +150,7 @@ public class SshServiceCommandShell extends ServiceCommandShell implements ISyst */ protected String getPromptCommand() { IHostShell shell = getHostShell(); - assert shell instanceof SshHostShell; + //assert shell instanceof SshHostShell; if (shell instanceof SshHostShell) { return ((SshHostShell)shell).getPromptCommand(); }