Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-08-19 12:55:08 +0000
committerEike Stepper2014-08-19 12:55:08 +0000
commite5b5d3422d97fbdeae6b09eb28e13f39b5766532 (patch)
tree5507e52a499f36538e71d0cce18959149a1d219a /plugins
parent00df41af987285ee2b79aca1e67434b59db68dff (diff)
downloadcdo-e5b5d3422d97fbdeae6b09eb28e13f39b5766532.tar.gz
cdo-e5b5d3422d97fbdeae6b09eb28e13f39b5766532.tar.xz
cdo-e5b5d3422d97fbdeae6b09eb28e13f39b5766532.zip
Fix ApiBaselineTask and version errors in net4j
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/CDO.setup2
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java11
3 files changed, 24 insertions, 21 deletions
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;
}

Back to the top