Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 918EEF0C9 for ; Tue, 6 Aug 2013 03:46:05 +0000 (UTC) Received: (qmail 98733 invoked by uid 500); 6 Aug 2013 03:20:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98714 invoked by uid 500); 6 Aug 2013 03:20:16 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 98374 invoked by uid 99); 6 Aug 2013 03:20:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Aug 2013 03:19:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2B3C08B9801; Tue, 6 Aug 2013 03:19:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org Date: Tue, 06 Aug 2013 03:19:56 -0000 Message-Id: <3663e3945004499489fd6a48abb4f4d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: handle-trigger-non-existance patch by Vijay; reviewed by Brandon Williams for CASSANDRA-5826 Updated Branches: refs/heads/trunk 913edd650 -> aa581e02f handle-trigger-non-existance patch by Vijay; reviewed by Brandon Williams for CASSANDRA-5826 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6851c818 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6851c818 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6851c818 Branch: refs/heads/trunk Commit: 6851c81867f317110487b05b509841f5c159aaf1 Parents: cf62bdc Author: Vijay Parthasarathy Authored: Mon Aug 5 19:45:57 2013 -0700 Committer: Vijay Parthasarathy Committed: Mon Aug 5 20:15:36 2013 -0700 ---------------------------------------------------------------------- .../cassandra/triggers/TriggerExecutor.java | 6 ++++-- .../org/apache/cassandra/utils/FBUtilities.java | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6851c818/src/java/org/apache/cassandra/triggers/TriggerExecutor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java index c6feb84..582a224 100644 --- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java +++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java @@ -42,7 +42,6 @@ public class TriggerExecutor private final Map cachedTriggers = Maps.newConcurrentMap(); private final ClassLoader parent = Thread.currentThread().getContextClassLoader(); - private final File triggerDirectory = FBUtilities.cassandraTriggerDir(); private volatile ClassLoader customClassLoader; private TriggerExecutor() @@ -56,7 +55,10 @@ public class TriggerExecutor */ public void reloadClasses() { - customClassLoader = new CustomClassLoader(parent, triggerDirectory); + File tiggerDirectory = FBUtilities.cassandraTriggerDir(); + if (tiggerDirectory == null) + return; + customClassLoader = new CustomClassLoader(parent, tiggerDirectory); cachedTriggers.clear(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/6851c818/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index 7873ce7..e5bd71e 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -52,7 +52,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.IAllocator; import org.apache.cassandra.net.AsyncOneResponse; import org.apache.thrift.TBase; @@ -344,13 +343,22 @@ public class FBUtilities public static File cassandraTriggerDir() { - File triggerDir; + File triggerDir = null; if (System.getProperty("cassandra.triggers_dir") != null) + { triggerDir = new File(System.getProperty("cassandra.triggers_dir")); + } else - triggerDir = new File(FBUtilities.class.getClassLoader().getResource(DEFAULT_TRIGGER_DIR).getFile()); - if (!triggerDir.exists()) - throw new RuntimeException("Trigger Directory doesnt exist, please create inside conf."); + { + URL confDir = FBUtilities.class.getClassLoader().getResource(DEFAULT_TRIGGER_DIR); + if (confDir != null) + triggerDir = new File(confDir.getFile()); + } + if (triggerDir == null || !triggerDir.exists()) + { + logger.warn("Trigger Directory doesnt exist, please create it and try again."); + return null; + } return triggerDir; }