[6/6] git commit: Correctly catch exception when Snappy cannot be loaded

2012-07-05 Thread slebresne 
Correctly catch exception when Snappy cannot be loaded

patch by slebresne; reviewed by Andy Cobley for CASSANDRA-4400


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

Branch: refs/heads/trunk
Commit: 9a8a8902b223db00fa18c55ecf8f33c269325ea5
Parents: b8ca84c
Author: Sylvain Lebresne 
Authored: Thu Jul 5 18:08:14 2012 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 5 18:08:14 2012 +0200

--
 CHANGES.txt|1 +
 .../cassandra/io/compress/SnappyCompressor.java|9 +
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8a8902/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cd12a5..4576480 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * restore pre-CASSANDRA-3862 approach to removing expired tombstones
from row cache during compaction (CASSANDRA-4364)
  * (stress) support for CQL prepared statements (CASSANDRA-3633)
+ * Correctly catch exception when Snappy cannot be loaded (CASSANDRA-4400)
 Merged from 1.0:
  * allow dropping columns shadowed by not-yet-expired supercolumn or row
tombstones in PrecompactedRow (CASSANDRA-4396)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8a8902/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
--
diff --git a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java 
b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
index 9d17492..e869cf7 100644
--- a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
+++ b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xerial.snappy.Snappy;
+import org.xerial.snappy.SnappyError;
 
 public class SnappyCompressor implements ICompressor
 {
@@ -63,6 +64,14 @@ public class SnappyCompressor implements ICompressor
 {
 return false;
 }
+catch (SnappyError e)
+{
+return false;
+}
+catch (UnsatisfiedLinkError e)
+{
+return false;
+}
 }
 
 public Set supportedOptions()

git commit: Correctly catch exception when Snappy cannot be loaded

2012-07-05 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.1 b8ca84c8a -> 9a8a8902b


Correctly catch exception when Snappy cannot be loaded

patch by slebresne; reviewed by Andy Cobley for CASSANDRA-4400


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

Branch: refs/heads/cassandra-1.1
Commit: 9a8a8902b223db00fa18c55ecf8f33c269325ea5
Parents: b8ca84c
Author: Sylvain Lebresne 
Authored: Thu Jul 5 18:08:14 2012 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 5 18:08:14 2012 +0200

--
 CHANGES.txt|1 +
 .../cassandra/io/compress/SnappyCompressor.java|9 +
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8a8902/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 7cd12a5..4576480 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * restore pre-CASSANDRA-3862 approach to removing expired tombstones
from row cache during compaction (CASSANDRA-4364)
  * (stress) support for CQL prepared statements (CASSANDRA-3633)
+ * Correctly catch exception when Snappy cannot be loaded (CASSANDRA-4400)
 Merged from 1.0:
  * allow dropping columns shadowed by not-yet-expired supercolumn or row
tombstones in PrecompactedRow (CASSANDRA-4396)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a8a8902/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
--
diff --git a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java 
b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
index 9d17492..e869cf7 100644
--- a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
+++ b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xerial.snappy.Snappy;
+import org.xerial.snappy.SnappyError;
 
 public class SnappyCompressor implements ICompressor
 {
@@ -63,6 +64,14 @@ public class SnappyCompressor implements ICompressor
 {
 return false;
 }
+catch (SnappyError e)
+{
+return false;
+}
+catch (UnsatisfiedLinkError e)
+{
+return false;
+}
 }
 
 public Set supportedOptions()