cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/6] git commit: Silence errors about java agent in debian scripts. Patch by Federico Piccinini, reviewed by brandonwilliams for CASSANDRA-6775
Date Wed, 26 Feb 2014 20:27:19 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 157cbdfad -> 7b5bdd256
  refs/heads/cassandra-2.1 583041f54 -> fbf075d28
  refs/heads/trunk 8809d8ada -> 9c4824d6c


Silence errors about java agent in debian scripts.
Patch by Federico Piccinini, reviewed by brandonwilliams for
CASSANDRA-6775


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

Branch: refs/heads/cassandra-2.0
Commit: 7b5bdd256a74202d04496f288ca9cb2a9b6e9b6f
Parents: 157cbdf
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Feb 26 14:23:02 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Feb 26 14:23:02 2014 -0600

----------------------------------------------------------------------
 debian/cassandra.in.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b5bdd25/debian/cassandra.in.sh
----------------------------------------------------------------------
diff --git a/debian/cassandra.in.sh b/debian/cassandra.in.sh
index 13005e2..4da19d8 100644
--- a/debian/cassandra.in.sh
+++ b/debian/cassandra.in.sh
@@ -19,4 +19,12 @@ for jar in /usr/share/cassandra/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
-CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
\ No newline at end of file
+CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
+
+
+# set JVM javaagent opts to avoid warnings/errors
+if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
+      || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
+then
+    JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+fi


Mime
View raw message