Forschungssoftware will stop it's service on 25.05.2018 due to the new EU regulations. Please make sure you backup your projects!

Commit c9a7efd4 by Christian Bürckert

Merge branch 'issue35' into 'release1.0'

Issue35



See merge request !14
parents a739bc23 b457e7f8
......@@ -122,7 +122,7 @@
<dependency>
<groupId>de.dfki.tecs</groupId>
<artifactId>libtecs</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
</dependency>
</dependencies>
<properties>
......
......@@ -17,7 +17,7 @@ using System.Runtime.CompilerServices;
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion("1.0.3")]
[assembly: AssemblyVersion("1.0.4")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dfki.tecs</groupId>
<artifactId>libtecs</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<packaging>jar</packaging>
<name>Java libtecs</name>
......
......@@ -167,8 +167,8 @@ public class TECSClient {
//Open the connection
socketChannel = SocketChannel.open();
socketChannel.connect(new InetSocketAddress(host, port));
socketChannel.configureBlocking(false);
socketChannel.connect(new InetSocketAddress(host, port));
//Wait if the connection is availble in RECONNECT_TIMEOUT ms
long breakAttempt = System.currentTimeMillis() + RECONNECT_TIMEOUT;
......
......@@ -38,7 +38,7 @@ def run_setup():
setup(
name = 'libtecs',
version = '1.0.3',
version = '1.0.4',
description = 'Python Bindings for TECS',
author = 'Christian Buerckert',
author_email = 'christian.buerckert@dfki.de',
......
Gem::Specification.new do |s|
s.name = 'libtecs'
s.version = '1.0.3'
s.version = '1.0.4'
s.date = '2015-01-11'
s.summary = "Library for TECS Communication in Ruby"
s.description = ""
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dfki.tecs</groupId>
<artifactId>server</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<packaging>jar</packaging>
<name>TECS-Server</name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment