From 137ebf2f52b0ee3929a611fabfff0635fa4d5367 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 5 Mar 2009 11:36:50 +0000 Subject: [PATCH] [267181] Fix telnet option negotiation loop --- releng/org.eclipse.rse.build/maps/terminal.map | 2 +- .../eclipse/tm/internal/terminal/telnet/TelnetOption.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map index 58312624d47..b954a06270a 100644 --- a/releng/org.eclipse.rse.build/maps/terminal.map +++ b/releng/org.eclipse.rse.build/maps/terminal.map @@ -8,6 +8,6 @@ feature@org.eclipse.tm.terminal.view=v200902011800,:pserver:anonymous:none@dev.e plugin@org.eclipse.tm.terminal=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal plugin@org.eclipse.tm.terminal.serial=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial plugin@org.eclipse.tm.terminal.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh -plugin@org.eclipse.tm.terminal.telnet=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet +plugin@org.eclipse.tm.terminal.telnet=v200903051130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet plugin@org.eclipse.tm.terminal.test=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test plugin@org.eclipse.tm.terminal.view=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file diff --git a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java b/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java index 60f752208dd..76596a4308f 100644 --- a/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java +++ b/terminal/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetOption.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2005, 2009 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,8 +11,9 @@ * Helmut Haigermoser and Ted Williams. * * Contributors: - * Michael Scharf (Wind River) - split into core, view and connector plugins + * Michael Scharf (Wind River) - split into core, view and connector plugins * Martin Oberhuber (Wind River) - fixed copyright headers and beautified + * Martin Oberhuber (Wind River) - [267181] Fix telnet option negotiation loop *******************************************************************************/ package org.eclipse.tm.internal.terminal.telnet; @@ -647,8 +648,7 @@ class TelnetOption implements TelnetCodes * @return Returns true if the new negotiation should be ignored, false if not. */ protected boolean ignoreNegotiation() { - return (System.currentTimeMillis() - negotiationCompletionTime - .getTime()) > NEGOTIATION_IGNORE_DURATION; + return (System.currentTimeMillis() - negotiationCompletionTime.getTime()) < NEGOTIATION_IGNORE_DURATION; } /**