Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-04-02 16:35:28 -0400
committerslewis2018-04-02 16:35:28 -0400
commitcb6ad2d9a924cbcacc8324eaf38fc3462423a94c (patch)
tree6b0f73940ec59ba0328f89b2b357415f19cb585e
parentcea975f5f0c4520a85b81e1633dd610b5658db81 (diff)
downloadorg.eclipse.ecf-cb6ad2d9a924cbcacc8324eaf38fc3462423a94c.tar.gz
org.eclipse.ecf-cb6ad2d9a924cbcacc8324eaf38fc3462423a94c.tar.xz
org.eclipse.ecf-cb6ad2d9a924cbcacc8324eaf38fc3462423a94c.zip
Fix for version change.
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/pom.xml2
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml
index 0a987efe8..6178b224e 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.sharedobject</artifactId>
- <version>2.5.200-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
index 7b929e669..4d3613a0c 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
@@ -225,7 +225,7 @@ final class TCPChannelFactory implements NetworkChannelFactory {
}
socket.setTcpNoDelay(true);
BufferedOutputStream bos = new BufferedOutputStream(socket.getOutputStream());
- output = SERIALIZATION_DEFAULT.equals(OSGI_SERIALIZATION)?new OSGIObjectOutputStream(bos):new SmartObjectOutputStream(bos);
+ output = SERIALIZATION_DEFAULT.equals(OSGI_SERIALIZATION)?new OSGIObjectOutputStream(bos,true):new SmartObjectOutputStream(bos);
output.flush();
BufferedInputStream bins = new BufferedInputStream(socket.getInputStream());
input = SERIALIZATION_DEFAULT.equals(OSGI_SERIALIZATION)?new OSGIObjectInputStream(RemoteOSGiActivator.getActivator().getContext().getBundle(),bins):new SmartObjectInputStream(bins);

Back to the top