You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2016/05/23 22:12:56 UTC

[01/10] cassandra git commit: Avoid calls to `getCause` on `Throwable` as it might result into NPE

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 e0c6a9eca -> f463fed23
  refs/heads/cassandra-3.0 4cdce5645 -> 9904c628a
  refs/heads/cassandra-3.7 bdb942173 -> 1f60143bb
  refs/heads/trunk 93b3aa8a4 -> 5cc280d68


Avoid calls to `getCause` on `Throwable` as it might result into NPE

Patch by Alex Petrov; reviewed by Joel Knighton for CASSANDRA-11272


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

Branch: refs/heads/cassandra-2.2
Commit: f463fed234ce5bd9c536ac5fdf51c3555b9af805
Parents: e0c6a9e
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri May 20 20:02:48 2016 +0200
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:10:23 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f463fed2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index dedc823..82d7c8f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1255,7 +1255,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
             @Override
             public void onFailure(Throwable e)
             {
-                logger.warn("Error during bootstrap: " + e.getCause().getMessage(), e.getCause());
+                logger.warn("Error during bootstrap.", e);
             }
         });
         try


[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@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/9904c628
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9904c628
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9904c628

Branch: refs/heads/trunk
Commit: 9904c628a9c38d72e6fca56b09d5da8c1a84cba1
Parents: 4cdce56 f463fed
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:11:46 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:11:46 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9904c628/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@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/9904c628
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9904c628
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9904c628

Branch: refs/heads/cassandra-3.7
Commit: 9904c628a9c38d72e6fca56b09d5da8c1a84cba1
Parents: 4cdce56 f463fed
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:11:46 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:11:46 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9904c628/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/trunk
Commit: 1f60143bb7f0df7b15c70481b3381ac18df869a4
Parents: bdb9421 9904c62
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:12:07 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:12:07 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f60143b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@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/9904c628
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9904c628
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9904c628

Branch: refs/heads/cassandra-3.0
Commit: 9904c628a9c38d72e6fca56b09d5da8c1a84cba1
Parents: 4cdce56 f463fed
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:11:46 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:11:46 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9904c628/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


[03/10] cassandra git commit: Avoid calls to `getCause` on `Throwable` as it might result into NPE

Posted by jm...@apache.org.
Avoid calls to `getCause` on `Throwable` as it might result into NPE

Patch by Alex Petrov; reviewed by Joel Knighton for CASSANDRA-11272


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

Branch: refs/heads/cassandra-3.7
Commit: f463fed234ce5bd9c536ac5fdf51c3555b9af805
Parents: e0c6a9e
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri May 20 20:02:48 2016 +0200
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:10:23 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f463fed2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index dedc823..82d7c8f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1255,7 +1255,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
             @Override
             public void onFailure(Throwable e)
             {
-                logger.warn("Error during bootstrap: " + e.getCause().getMessage(), e.getCause());
+                logger.warn("Error during bootstrap.", e);
             }
         });
         try


[04/10] cassandra git commit: Avoid calls to `getCause` on `Throwable` as it might result into NPE

Posted by jm...@apache.org.
Avoid calls to `getCause` on `Throwable` as it might result into NPE

Patch by Alex Petrov; reviewed by Joel Knighton for CASSANDRA-11272


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

Branch: refs/heads/trunk
Commit: f463fed234ce5bd9c536ac5fdf51c3555b9af805
Parents: e0c6a9e
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri May 20 20:02:48 2016 +0200
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:10:23 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f463fed2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index dedc823..82d7c8f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1255,7 +1255,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
             @Override
             public void onFailure(Throwable e)
             {
-                logger.warn("Error during bootstrap: " + e.getCause().getMessage(), e.getCause());
+                logger.warn("Error during bootstrap.", e);
             }
         });
         try


[10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

Posted by jm...@apache.org.
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 5cc280d68ee8e76b75905b32dfa8fd4b513af4ee
Parents: 93b3aa8 1f60143
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:12:19 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:12:19 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[02/10] cassandra git commit: Avoid calls to `getCause` on `Throwable` as it might result into NPE

Posted by jm...@apache.org.
Avoid calls to `getCause` on `Throwable` as it might result into NPE

Patch by Alex Petrov; reviewed by Joel Knighton for CASSANDRA-11272


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

Branch: refs/heads/cassandra-3.0
Commit: f463fed234ce5bd9c536ac5fdf51c3555b9af805
Parents: e0c6a9e
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri May 20 20:02:48 2016 +0200
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:10:23 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f463fed2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index dedc823..82d7c8f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1255,7 +1255,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
             @Override
             public void onFailure(Throwable e)
             {
-                logger.warn("Error during bootstrap: " + e.getCause().getMessage(), e.getCause());
+                logger.warn("Error during bootstrap.", e);
             }
         });
         try


[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/cassandra-3.7
Commit: 1f60143bb7f0df7b15c70481b3381ac18df869a4
Parents: bdb9421 9904c62
Author: Josh McKenzie <jm...@apache.org>
Authored: Mon May 23 18:12:07 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Mon May 23 18:12:07 2016 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f60143b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------