Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 41863 invoked from network); 14 May 2010 19:21:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 May 2010 19:21:43 -0000 Received: (qmail 73970 invoked by uid 500); 14 May 2010 19:21:43 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 73929 invoked by uid 500); 14 May 2010 19:21:43 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 73922 invoked by uid 99); 14 May 2010 19:21:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 May 2010 19:21:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 May 2010 19:21:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 01A2523888EA; Fri, 14 May 2010 19:21:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r944411 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Date: Fri, 14 May 2010 19:21:19 -0000 To: commits@felix.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100514192120.01A2523888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickhall Date: Fri May 14 19:21:19 2010 New Revision: 944411 URL: http://svn.apache.org/viewvc?rev=944411&view=rev Log: Improve exception messages. (FELIX-2035) Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=944411&r1=944410&r2=944411&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Fri May 14 19:21:19 2010 @@ -985,10 +985,11 @@ public class ResolverImpl implements Res ResolveException ex = new ResolveException( "Constraint violation for package '" + entry.getKey() + "' when resolving module " - + module + " between an imported constraint " - + sourceBlame + " and an additional imported constraint " + + module + " between an import " + + sourceBlame + " and a fragment import " + blame, module, blame.m_reqs.get(0)); m_logger.log(Logger.LOG_DEBUG, "Conflicting fragment import", ex); + throw ex; } } } @@ -1013,7 +1014,7 @@ public class ResolverImpl implements Res : new ResolveException( "Constraint violation for package '" + pkgName + "' when resolving module " - + module + " between existing exported constraint " + + module + " between existing export " + entry.getValue() + " and uses constraint " + blame, null, null); mutated = (mutated != null) @@ -1072,7 +1073,7 @@ public class ResolverImpl implements Res : new ResolveException( "Constraint violation for package '" + pkgName + "' when resolving module " - + module + " between existing imported constraint " + + module + " between existing import " + importBlame + " and uses constraint " + usedBlame, null, null);