Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2019-02-20 16:01:51 -0500
committerslewis2019-02-20 16:01:51 -0500
commit81b85f27cc73646869c02ffa1e3b5e02d6bf6211 (patch)
treecb56b725fb99495971f5ad4e31cbeadcbecf91e7 /framework/bundles
parent5d501929b628b6aa6d28b2f5df73fc45c0fa1945 (diff)
downloadorg.eclipse.ecf-81b85f27cc73646869c02ffa1e3b5e02d6bf6211.tar.gz
org.eclipse.ecf-81b85f27cc73646869c02ffa1e3b5e02d6bf6211.tar.xz
org.eclipse.ecf-81b85f27cc73646869c02ffa1e3b5e02d6bf6211.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=544239
Updated version numbers in bundle, features with bundle and top-level features 3.14.4 -> 3.14.5 Change-Id: Ic8927bc3a97d93b5cc95ac7e4f0fdce676188776
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java8
3 files changed, 10 insertions, 2 deletions
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index c4282322a..5492207aa 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
Bundle-Name: %plugin.name
Bundle-Vendor: %plugin.provider
Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin
diff --git a/framework/bundles/org.eclipse.ecf.provider/pom.xml b/framework/bundles/org.eclipse.ecf.provider/pom.xml
index 022013501..fb531edca 100644
--- a/framework/bundles/org.eclipse.ecf.provider/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider</artifactId>
- <version>4.8.0-SNAPSHOT</version>
+ <version>4.8.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java
index f5262da01..f28a997f2 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java
@@ -62,6 +62,7 @@ public final class SSLClient implements ISynchAsynchConnection {
boolean disconnectHandled = false;
private final Object disconnectLock = new Object();
protected final Object outputStreamLock = new Object();
+ private int maxmsgs = DEFAULT_MAX_BUFFER_MSG;
private String getHostNameForAddressWithoutLookup(InetAddress inetAddress) {
// First get InetAddress.toString(), which returns
@@ -285,12 +286,19 @@ public final class SSLClient implements ISynchAsynchConnection {
}
}
+ private int resetCounter = 0;
+
void send(Serializable snd) throws IOException {
// debug("send(" + snd + ")"); //$NON-NLS-1$ //$NON-NLS-2$
// need to synchronize to avoid concurrent access to outputStream
synchronized (outputStreamLock) {
outputStream.writeObject(snd);
outputStream.flush();
+ if (resetCounter > this.maxmsgs) {
+ outputStream.reset();
+ resetCounter = 0;
+ } else
+ resetCounter++;
}
}

Back to the top