Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-08-06 02:58:32 -0400
committerEike Stepper2013-08-06 02:58:32 -0400
commitc58fb4de474c05d9e936f63f9cc97f34a8ee0db9 (patch)
treee4083669d6f2fb6aee56875e9a18559097bbfb7f
parent20a3aff450b7e0525d0299aebd2d027ce23bc94e (diff)
downloadcdo-c58fb4de474c05d9e936f63f9cc97f34a8ee0db9.tar.gz
cdo-c58fb4de474c05d9e936f63f9cc97f34a8ee0db9.tar.xz
cdo-c58fb4de474c05d9e936f63f9cc97f34a8ee0db9.zip
[414456] Broken pipe on TCPSelector
https://bugs.eclipse.org/bugs/show_bug.cgi?id=414456
-rw-r--r--features/org.eclipse.net4j-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.defs-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF28
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java9
4 files changed, 23 insertions, 18 deletions
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 34e098d587..483592742d 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.2.0.qualifier"
+ version="4.2.1.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 b1b815d5e6..5087ca8946 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.2.0.qualifier"
+ version="4.2.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 2f2c88f6c8..ff3599b081 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.2.0.qualifier
+Bundle-Version: 4.2.1.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.2.0";
+Export-Package: org.eclipse.internal.net4j;version="4.2.1";
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.2.0";
org.eclipse.net4j.http.tests,
org.eclipse.net4j.tests,
org.eclipse.net4j.defs",
- org.eclipse.internal.net4j.buffer;version="4.2.0";
+ org.eclipse.internal.net4j.buffer;version="4.2.1";
x-friends:="org.eclipse.net4j.http.server,
org.eclipse.net4j.jvm,
org.eclipse.net4j.tcp,
@@ -29,15 +29,15 @@ Export-Package: org.eclipse.internal.net4j;version="4.2.0";
org.eclipse.net4j.http.tests,
org.eclipse.net4j.tests,
org.eclipse.net4j.defs",
- org.eclipse.internal.net4j.bundle;version="4.2.0";x-internal:=true,
- org.eclipse.net4j;version="4.2.0",
- org.eclipse.net4j.acceptor;version="4.2.0",
- org.eclipse.net4j.buffer;version="4.2.0",
- org.eclipse.net4j.channel;version="4.2.0",
- org.eclipse.net4j.connector;version="4.2.0",
- org.eclipse.net4j.protocol;version="4.2.0",
- org.eclipse.net4j.signal;version="4.2.0",
- org.eclipse.net4j.signal.heartbeat;version="4.2.0",
- org.eclipse.net4j.signal.wrapping;version="4.2.0",
- org.eclipse.spi.net4j;version="4.2.0"
+ org.eclipse.internal.net4j.bundle;version="4.2.1";x-internal:=true,
+ org.eclipse.net4j;version="4.2.1",
+ org.eclipse.net4j.acceptor;version="4.2.1",
+ org.eclipse.net4j.buffer;version="4.2.1",
+ org.eclipse.net4j.channel;version="4.2.1",
+ org.eclipse.net4j.connector;version="4.2.1",
+ org.eclipse.net4j.protocol;version="4.2.1",
+ org.eclipse.net4j.signal;version="4.2.1",
+ org.eclipse.net4j.signal.heartbeat;version="4.2.1",
+ org.eclipse.net4j.signal.wrapping;version="4.2.1",
+ org.eclipse.spi.net4j;version="4.2.1"
Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
index c358b4ea68..b1493c6f25 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/Buffer.java
@@ -424,7 +424,10 @@ public class Buffer implements InternalBuffer
{
try
{
- socketChannel.read(buffer);
+ if (socketChannel.read(buffer) == -1)
+ {
+ throw new IOException("Channel has reached end-of-stream");
+ }
}
catch (ClosedChannelException ex)
{
@@ -432,7 +435,9 @@ public class Buffer implements InternalBuffer
}
catch (IOException ex)
{
- throw new ClosedChannelException();
+ ClosedChannelException exception = new ClosedChannelException();
+ exception.initCause(ex);
+ throw exception;
}
}
}

Back to the top