From 809792e64ea0c64f2537aa82cd8a7d2ff7376757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rg=20Prante?= <joergprante@gmail.com>
Date: Thu, 26 Aug 2021 18:48:52 +0200
Subject: [PATCH] fix timeout which is in milliseconds, set default to 5000ms

---
 gradle.properties                                    |  6 +++---
 .../java/org/xbib/z3950/client/jdk/JDKZClient.java   | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e29e8c4..fbaa2ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group = org.xbib
 name = z3950
-version = 2.3.2
+version = 2.3.3
 
 gradle.wrapper.version = 6.6.1
-netty.version = 4.1.65.Final
-xbib-cql.version = 3.1.0
+netty.version = 4.1.66.Final
+xbib-cql.version = 3.1.2
 xbib-bibliographic-character-sets.version = 2.0.0
diff --git a/z3950-client-jdk/src/main/java/org/xbib/z3950/client/jdk/JDKZClient.java b/z3950-client-jdk/src/main/java/org/xbib/z3950/client/jdk/JDKZClient.java
index 4db0f2a..c869652 100644
--- a/z3950-client-jdk/src/main/java/org/xbib/z3950/client/jdk/JDKZClient.java
+++ b/z3950-client-jdk/src/main/java/org/xbib/z3950/client/jdk/JDKZClient.java
@@ -72,7 +72,11 @@ public class JDKZClient implements Client, Closeable {
 
     private OutputStreamBERWriter berWriter;
 
-    private JDKZClient(String host, int port, String user, String pass, long timeout,
+    private JDKZClient(String host,
+                       int port,
+                       String user,
+                       String pass,
+                       long timeout,
                        String preferredRecordSyntax,
                        String resultSetName,
                        String elementSetName,
@@ -259,8 +263,8 @@ public class JDKZClient implements Client, Closeable {
         try {
             lock.lock();
             Socket socket = new Socket();
-            socket.connect(new InetSocketAddress(host, port), (int) timeout);
-            socket.setSoTimeout((int) timeout * 1000);
+            socket.connect(new InetSocketAddress(host, port), (int) timeout); // in milliseconds
+            socket.setSoTimeout((int) timeout); // timeout in milliseconds
             this.socket = socket;
             InputStream src = new BufferedInputStream(socket.getInputStream());
             OutputStream dest = new BufferedOutputStream(socket.getOutputStream());
@@ -365,7 +369,7 @@ public class JDKZClient implements Client, Closeable {
 
         private String pass;
 
-        private long timeout;
+        private long timeout = 5000;
 
         private String preferredRecordSyntax = "1.2.840.10003.5.10"; // marc21