Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-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 776B6187A5 for ; Mon, 21 Mar 2016 18:49:25 +0000 (UTC) Received: (qmail 75546 invoked by uid 500); 21 Mar 2016 18:49:25 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 75520 invoked by uid 500); 21 Mar 2016 18:49:25 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 75511 invoked by uid 99); 21 Mar 2016 18:49:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 18:49:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DFF7DFA43; Mon, 21 Mar 2016 18:49:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Message-Id: <0e7236d5232f4a7ba8474ec5dc8b2e8f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cayenne git commit: more sane error message instead of 'Error loading DataChannel: 'null'' Date: Mon, 21 Mar 2016 18:49:25 +0000 (UTC) Repository: cayenne Updated Branches: refs/heads/master b0631deb2 -> 5c5aa6a40 more sane error message instead of 'Error loading DataChannel: 'null'' Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5c5aa6a4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5c5aa6a4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5c5aa6a4 Branch: refs/heads/master Commit: 5c5aa6a402d45f88d849348363d48f0fa388a57d Parents: b0631de Author: Andrus Adamchik Authored: Mon Mar 21 21:49:06 2016 +0300 Committer: Andrus Adamchik Committed: Mon Mar 21 21:49:06 2016 +0300 ---------------------------------------------------------------------- .../server/DataDomainLoadException.java | 56 ++++++++++---------- .../server/DataDomainProvider.java | 4 +- 2 files changed, 31 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5c5aa6a4/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java index 34434f0..37b5fc2 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java @@ -27,33 +27,33 @@ import org.apache.cayenne.configuration.DataChannelDescriptor; */ public class DataDomainLoadException extends ConfigurationException { - private ConfigurationTree configurationTree; - - public DataDomainLoadException() { - } - - public DataDomainLoadException(String messageFormat, Object... messageArgs) { - super(messageFormat, messageArgs); - } - - public DataDomainLoadException( - ConfigurationTree configurationTree, - String messageFormat, Object... messageArgs) { - super(messageFormat, messageArgs); - this.configurationTree = configurationTree; - } - - public DataDomainLoadException(Throwable cause) { - super(cause); - } - - public DataDomainLoadException(String messageFormat, Throwable cause, - Object... messageArgs) { - super(messageFormat, cause, messageArgs); - } - - public ConfigurationTree getConfigurationTree() { - return configurationTree; - } + private static final long serialVersionUID = 7969847819485380271L; + + private ConfigurationTree configurationTree; + + public DataDomainLoadException() { + } + + public DataDomainLoadException(String messageFormat, Object... messageArgs) { + super(messageFormat, messageArgs); + } + + public DataDomainLoadException(ConfigurationTree configurationTree, String messageFormat, + Object... messageArgs) { + super(messageFormat, messageArgs); + this.configurationTree = configurationTree; + } + + public DataDomainLoadException(Throwable cause) { + super(cause); + } + + public DataDomainLoadException(String messageFormat, Throwable cause, Object... messageArgs) { + super(messageFormat, cause, messageArgs); + } + + public ConfigurationTree getConfigurationTree() { + return configurationTree; + } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/5c5aa6a4/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java index 4815fe4..0b8ee5d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java @@ -92,7 +92,9 @@ public class DataDomainProvider implements Provider { } catch (ConfigurationException e) { throw e; } catch (Exception e) { - throw new DataDomainLoadException("Error loading DataChannel: '%s'", e, e.getMessage()); + String causeMessage = e.getMessage(); + String message = causeMessage != null && causeMessage.length() > 0 ? causeMessage : e.getClass().getName(); + throw new DataDomainLoadException("DataDomain startup failed: %s", e, message); } }