You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2019/08/22 15:27:34 UTC
svn commit: r1865688 - in
/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache:
./ broadcast/
Author: mreutegg
Date: Thu Aug 22 15:27:34 2019
New Revision: 1865688
URL: http://svn.apache.org/viewvc?rev=1865688&view=rev
Log:
OAK-7457: "Covariant return type change detected" warnings with java10
Apply patch provided by José Andrés Cordero Benítez
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/InMemoryBroadcaster.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/TCPBroadcaster.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/UDPBroadcaster.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java?rev=1865688&r1=1865687&r2=1865688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java Thu Aug 22 15:27:34 2019
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document.persistentCache;
import java.io.File;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.HashMap;
@@ -524,10 +525,10 @@ public class PersistentCache implements
writer.apply(buff);
ByteBuffer byteBuff = buff.getBuffer();
int length = byteBuff.position();
- byteBuff.limit(length);
+ ((Buffer)byteBuff).limit(length);
// write length
byteBuff.putInt(0, length);
- byteBuff.position(0);
+ ((Buffer)byteBuff).position(0);
b.send(byteBuff);
}
@@ -540,7 +541,7 @@ public class PersistentCache implements
// process only messages from other senders
receiveMessage(buff);
}
- buff.position(end);
+ ((Buffer)buff).position(end);
}
public static PersistentCacheStats getPersistentCacheStats(Cache<?, ?> cache) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/InMemoryBroadcaster.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/InMemoryBroadcaster.java?rev=1865688&r1=1865687&r2=1865688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/InMemoryBroadcaster.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/InMemoryBroadcaster.java Thu Aug 22 15:27:34 2019
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.persistentCache.broadcast;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -32,7 +33,7 @@ public class InMemoryBroadcaster impleme
public void send(ByteBuffer buff) {
int start = buff.position();
for (Listener l : listeners) {
- buff.position(start);
+ ((Buffer)buff).position(start);
l.receive(buff);
}
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/TCPBroadcaster.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/TCPBroadcaster.java?rev=1865688&r1=1865687&r2=1865688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/TCPBroadcaster.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/TCPBroadcaster.java Thu Aug 22 15:27:34 2019
@@ -26,6 +26,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.security.MessageDigest;
@@ -223,7 +224,7 @@ public class TCPBroadcaster implements B
ByteBuffer buff = ByteBuffer.wrap(data);
int start = buff.position();
for (Listener l : listeners) {
- buff.position(start);
+ ((Buffer)buff).position(start);
l.receive(buff);
}
}
@@ -324,7 +325,7 @@ public class TCPBroadcaster implements B
public void send(ByteBuffer buff) {
ByteBuffer b = ByteBuffer.allocate(buff.remaining());
b.put(buff);
- b.flip();
+ ((Buffer)b).flip();
while (sendBuffer.size() > MAX_BUFFER_SIZE) {
sendBuffer.poll();
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/UDPBroadcaster.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/UDPBroadcaster.java?rev=1865688&r1=1865687&r2=1865688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/UDPBroadcaster.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/broadcast/UDPBroadcaster.java Thu Aug 22 15:27:34 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.MulticastSocket;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.util.ArrayList;
@@ -132,10 +133,10 @@ public class UDPBroadcaster implements B
continue;
}
ByteBuffer buff = ByteBuffer.wrap(receiveData);
- buff.limit(len);
+ ((Buffer)buff).limit(len);
int start = key.length;
for (Listener l : listeners) {
- buff.position(start);
+ ((Buffer)buff).position(start);
l.receive(buff);
}
} catch (IOException e) {