diff options
8 files changed, 29 insertions, 26 deletions
diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml index 0d717324b6..b515d4fe07 100644 --- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.epp" label="%featureName" - version="4.3.100.qualifier" + version="4.4.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml index 0d40dd2049..0f152b6137 100644 --- a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.explorer.product" label="%featureName" - version="4.2.100.qualifier" + version="4.3.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg"> diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml index 8f9d6cc9c0..3c242584c6 100644 --- a/features/org.eclipse.net4j-feature/feature.xml +++ b/features/org.eclipse.net4j-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j" label="%featureName" - version="4.3.100.qualifier" + version="4.4.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.net4j.defs-feature/feature.xml b/features/org.eclipse.net4j.defs-feature/feature.xml index d77a72fb90..a2f7746600 100644 --- a/features/org.eclipse.net4j.defs-feature/feature.xml +++ b/features/org.eclipse.net4j.defs-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.defs" label="%featureName" - version="4.3.100.qualifier" + version="4.4.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index e59dd34e9a..df4ee0635b 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.sdk" label="%featureName" - version="4.3.100.qualifier" + version="4.4.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup index 7e09679380..05d8336785 100644 --- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup +++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup @@ -88,7 +88,7 @@ value="2"/> <setupTask xsi:type="pde:APIBaselineTask" - name="CDO 4.3 Baseline" + name="CDO" version="4.3" location="${installation.location/baseline}" remoteURI="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.3-baseline.zip/download"/> diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 1c2a5344f9..a71a151acd 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j;singleton:=true -Bundle-Version: 4.3.100.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.internal.net4j;version="4.3.100"; +Export-Package: org.eclipse.internal.net4j;version="4.4.0"; x-friends:="org.eclipse.net4j.http.server, org.eclipse.net4j.jvm, org.eclipse.net4j.tcp, @@ -20,7 +20,7 @@ Export-Package: org.eclipse.internal.net4j;version="4.3.100"; org.eclipse.net4j.http.tests, org.eclipse.net4j.tests, org.eclipse.net4j.defs", - org.eclipse.internal.net4j.buffer;version="4.3.100"; + org.eclipse.internal.net4j.buffer;version="4.4.0"; x-friends:="org.eclipse.net4j.http.server, org.eclipse.net4j.jvm, org.eclipse.net4j.tcp, @@ -29,17 +29,17 @@ Export-Package: org.eclipse.internal.net4j;version="4.3.100"; org.eclipse.net4j.http.tests, org.eclipse.net4j.tests, org.eclipse.net4j.defs", - org.eclipse.internal.net4j.bundle;version="4.3.100";x-internal:=true, - org.eclipse.net4j;version="4.3.100", - org.eclipse.net4j.acceptor;version="4.3.100", - org.eclipse.net4j.buffer;version="4.3.100", - org.eclipse.net4j.channel;version="4.3.100", - org.eclipse.net4j.connector;version="4.3.100", - org.eclipse.net4j.protocol;version="4.3.100", - org.eclipse.net4j.signal;version="4.3.100", - org.eclipse.net4j.signal.confirmation;version="4.3.100", - org.eclipse.net4j.signal.heartbeat;version="4.3.100", - org.eclipse.net4j.signal.security;version="4.3.100", - org.eclipse.net4j.signal.wrapping;version="4.3.100", - org.eclipse.spi.net4j;version="4.3.100" + org.eclipse.internal.net4j.bundle;version="4.4.0";x-internal:=true, + org.eclipse.net4j;version="4.4.0", + org.eclipse.net4j.acceptor;version="4.4.0", + org.eclipse.net4j.buffer;version="4.4.0", + org.eclipse.net4j.channel;version="4.4.0", + org.eclipse.net4j.connector;version="4.4.0", + org.eclipse.net4j.protocol;version="4.4.0", + org.eclipse.net4j.signal;version="4.4.0", + org.eclipse.net4j.signal.confirmation;version="4.4.0", + org.eclipse.net4j.signal.heartbeat;version="4.4.0", + org.eclipse.net4j.signal.security;version="4.4.0", + org.eclipse.net4j.signal.wrapping;version="4.4.0", + org.eclipse.spi.net4j;version="4.4.0" Eclipse-BuddyPolicy: registered diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index 58eb72b197..cbf813549a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -108,7 +108,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i /** * Equivalent to calling SignalProtocol.setTimeout(timeout, false). - * + * * @since 2.0 */ public void setTimeout(long timeout) @@ -118,13 +118,13 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i /** * Update the timeout used for signal end of stream waiting time. - * + * * @param timeout the new timeout * @param useOldTimeoutToSendNewOne true to use the old timeout, false to use the new specified one to sent to server side the new specified timeout * @return true if the new specified timeout has correctly been sent - * + * * NOTE: this second parameter is useful mostly for test to be able to set a to small timeout - * @since 4.3 + * @since 4.4 */ public boolean setTimeout(long timeout, boolean useOldTimeoutToSendNewOne) { @@ -134,14 +134,17 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i { handleSetTimeOut(timeout); } + if (oldTimeout != timeout && isActive()) { timeoutSent = sendSetTimeout(); } + if (timeoutSent && useOldTimeoutToSendNewOne) { handleSetTimeOut(timeout); } + return timeoutSent; } |