diff options
| author | Eike Stepper | 2015-02-18 07:48:30 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-02-18 14:43:00 +0000 |
| commit | 11849bb512f96679918611b3558bb4cf9ab653d9 (patch) | |
| tree | 3decc428a174305da06f4bdd6cf3d5f48d210ede /plugins/org.eclipse.net4j.tcp | |
| parent | e2cca3f21b3a8dd87ea3985911099c164763989a (diff) | |
| download | cdo-11849bb512f96679918611b3558bb4cf9ab653d9.tar.gz cdo-11849bb512f96679918611b3558bb4cf9ab653d9.tar.xz cdo-11849bb512f96679918611b3558bb4cf9ab653d9.zip | |
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.net4j.tcp')
| -rw-r--r-- | plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF | 14 | ||||
| -rw-r--r-- | plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF index 6ec9fd0373..ab5f72e255 100644 --- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true -Bundle-Version: 4.1.200.qualifier +Bundle-Version: 4.1.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,13 +12,13 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.internal.tcp;version="4.1.200"; +Export-Package: org.eclipse.net4j.internal.tcp;version="4.1.300"; x-friends:="org.eclipse.net4j.tests, org.eclipse.net4j.defs, org.eclipse.emf.cdo.examples, org.eclipse.net4j.ui", - org.eclipse.net4j.internal.tcp.bundle;version="4.1.200";x-internal:=true, - org.eclipse.net4j.internal.tcp.messages;version="4.1.200";x-internal:=true, - org.eclipse.net4j.internal.tcp.ssl;version="4.1.200";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples", - org.eclipse.net4j.tcp;version="4.1.200", - org.eclipse.net4j.tcp.ssl;version="4.1.200" + org.eclipse.net4j.internal.tcp.bundle;version="4.1.300";x-internal:=true, + org.eclipse.net4j.internal.tcp.messages;version="4.1.300";x-internal:=true, + org.eclipse.net4j.internal.tcp.ssl;version="4.1.300";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples", + org.eclipse.net4j.tcp;version="4.1.300", + org.eclipse.net4j.tcp.ssl;version="4.1.300" diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java index b63d9a36e3..3823a19c77 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java @@ -134,6 +134,7 @@ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPPassiveSe } ServerSocket socket = serverSocketChannel.socket(); + socket.setReuseAddress(true); socket.bind(addr); if (addr == null) |