You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/08/07 05:06:29 UTC

[1/6] cassandra git commit: Fix NPE when internode compression is off

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 fa6205c90 -> ed4fad19e
  refs/heads/cassandra-3.0 a472aa9ea -> 0a94c7a36
  refs/heads/trunk 709510e32 -> 448e276b7


Fix NPE when internode compression is off

patch by yukim; reviewed by Jeremiah Jordan; follow up for CASSANDRA-9884


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed4fad19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed4fad19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed4fad19

Branch: refs/heads/cassandra-2.2
Commit: ed4fad19ecd9b02892623ffd538c0c45dcdc5a56
Parents: fa6205c
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:04:54 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:04:54 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4fad19/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 375da64..cfdb854 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -21,6 +21,8 @@ import java.io.*;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.util.zip.Checksum;
 import java.util.Set;
 
@@ -162,7 +164,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
         }
         else
         {
-            in = new NIODataInputStream(socket.getChannel(), BUFFER_SIZE);
+            ReadableByteChannel channel = socket.getChannel();
+            in = new NIODataInputStream(channel != null ? channel : Channels.newChannel(socket.getInputStream()), BUFFER_SIZE);
         }
 
         while (true)

[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a94c7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a94c7a3

Branch: refs/heads/trunk
Commit: 0a94c7a36c778e7429c68ac23c018e2f6db1b27e
Parents: a472aa9 ed4fad1
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:06:02 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:06:02 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a94c7a3/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a94c7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a94c7a3

Branch: refs/heads/cassandra-3.0
Commit: 0a94c7a36c778e7429c68ac23c018e2f6db1b27e
Parents: a472aa9 ed4fad1
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:06:02 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:06:02 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a94c7a3/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------

[2/6] cassandra git commit: Fix NPE when internode compression is off

Posted by yu...@apache.org.
Fix NPE when internode compression is off

patch by yukim; reviewed by Jeremiah Jordan; follow up for CASSANDRA-9884


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed4fad19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed4fad19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed4fad19

Branch: refs/heads/cassandra-3.0
Commit: ed4fad19ecd9b02892623ffd538c0c45dcdc5a56
Parents: fa6205c
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:04:54 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:04:54 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4fad19/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 375da64..cfdb854 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -21,6 +21,8 @@ import java.io.*;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.util.zip.Checksum;
 import java.util.Set;
 
@@ -162,7 +164,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
         }
         else
         {
-            in = new NIODataInputStream(socket.getChannel(), BUFFER_SIZE);
+            ReadableByteChannel channel = socket.getChannel();
+            in = new NIODataInputStream(channel != null ? channel : Channels.newChannel(socket.getInputStream()), BUFFER_SIZE);
         }
 
         while (true)

[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/448e276b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/448e276b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/448e276b

Branch: refs/heads/trunk
Commit: 448e276b79035808a40202b7cfeee40f72a84a1e
Parents: 709510e 0a94c7a
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:06:14 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:06:14 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------

[3/6] cassandra git commit: Fix NPE when internode compression is off

Posted by yu...@apache.org.
Fix NPE when internode compression is off

patch by yukim; reviewed by Jeremiah Jordan; follow up for CASSANDRA-9884


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed4fad19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed4fad19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed4fad19

Branch: refs/heads/trunk
Commit: ed4fad19ecd9b02892623ffd538c0c45dcdc5a56
Parents: fa6205c
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 6 22:04:54 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 6 22:04:54 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4fad19/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 375da64..cfdb854 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -21,6 +21,8 @@ import java.io.*;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.util.zip.Checksum;
 import java.util.Set;
 
@@ -162,7 +164,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
         }
         else
         {
-            in = new NIODataInputStream(socket.getChannel(), BUFFER_SIZE);
+            ReadableByteChannel channel = socket.getChannel();
+            in = new NIODataInputStream(channel != null ? channel : Channels.newChannel(socket.getInputStream()), BUFFER_SIZE);
         }
 
         while (true)