Commit b3ecaeb8 authored by Marian Dovgialo's avatar Marian Dovgialo

#46094 Merge branch 'development' into dev/46094_svarog_loses_signal_after_stopping_long_recording

parents f4fad842 36a219a5
#!/usr/bin/env bash
VERSION=`git describe --tags --first-parent`
VERSION=`git describe --tags`
#usage:
#update_version_in_file 'file_path'
......
......@@ -208,7 +208,6 @@
resultproperty="git-describe.result">
<arg value="describe" />
<arg value="--tags" />
<arg value="--first-parent" />
</exec>
<condition property="svarog.git-version"
value="${git-describe.output}"
......@@ -559,7 +558,7 @@
<dependency>
<groupId>org.zeromq</groupId>
<artifactId>jeromq</artifactId>
<version>0.3.5</version>
<version>0.5.1</version>
</dependency>
<dependency>
<groupId>com.getsentry.raven</groupId>
......
......@@ -201,7 +201,8 @@ private void publishTagFromMessage(BaseMessage msg) {
style = stylesGenerator.getSmartStyleFor(tagMsg.getName(), tagLen, -1);
tagSet.addStyle(style);
}
int channel = -1;
int channel = -1;
try{
channel = Integer.parseInt(tagMsg.getChannels());
}
......
......@@ -91,7 +91,7 @@ public final BaseMessage askPeer(BaseMessage message, String repURL) throws Open
*/
private static String bindSocket(ZMQ.Socket socket, String address) {
socket.bind(address);
return (String) socket.base().getsockoptx(zmq.ZMQ.ZMQ_LAST_ENDPOINT);
return (String) socket.base().getSocketOptx(zmq.ZMQ.ZMQ_LAST_ENDPOINT);
}
/**
......@@ -137,7 +137,7 @@ public void connect() throws CommunicationException, OpenbciCommunicationExcepti
* @return true if more parts are coming, false otherwise
*/
private static boolean isRcvMore(ZMQ.Socket socket) {
int rcvMore = (Integer) socket.base().getsockoptx(zmq.ZMQ.ZMQ_RCVMORE);
int rcvMore = (Integer) socket.base().getSocketOptx(zmq.ZMQ.ZMQ_RCVMORE);
return rcvMore == 1;
}
......
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