Skip to content

Commit 2dc3211

Browse files
author
dmitriy.grytsovets
committed
ByteBuffer in msgpack support fixes
source 1.6
1 parent ebfaa4c commit 2dc3211

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<artifactId>maven-compiler-plugin</artifactId>
4040
<version>3.2</version>
4141
<configuration>
42-
<source>1.5</source>
43-
<target>1.5</target>
42+
<source>1.6</source>
43+
<target>1.6</target>
4444
</configuration>
4545
</plugin>
4646
</plugins>

src/main/java/org/tarantool/MsgPackLite.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void pack(Object item, OutputStream os) throws IOException {
141141
out.writeInt(data.length);
142142
}
143143
out.write(data);
144-
} else if (item instanceof byte[]) {
144+
} else if (item instanceof byte[] || item instanceof ByteBuffer) {
145145
byte[] data;
146146
if (item instanceof byte[]) {
147147
data = (byte[]) item;

src/main/java/org/tarantool/TarantoolClientImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected void connect(final SocketChannel channel) throws Exception {
156156
} finally {
157157
bufferLock.unlock();
158158
}
159-
startThreads(channel.getRemoteAddress().toString());
159+
startThreads(channel.socket().getRemoteSocketAddress().toString());
160160
this.thumbstone = null;
161161
alive.countDown();
162162
}

0 commit comments

Comments
 (0)