Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 49645 invoked from network); 6 Nov 2009 03:32:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Nov 2009 03:32:04 -0000 Received: (qmail 59131 invoked by uid 500); 6 Nov 2009 03:32:04 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 59081 invoked by uid 500); 6 Nov 2009 03:32:03 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 59072 invoked by uid 99); 6 Nov 2009 03:32:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 03:32:03 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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, 06 Nov 2009 03:32:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6634323888C2; Fri, 6 Nov 2009 03:31:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833292 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/impl: DefaultPackageScanClassResolver.java DefaultRouteContext.java ServiceSupport.java WebSpherePackageScanClassResolver.java Date: Fri, 06 Nov 2009 03:31:37 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091106033137.6634323888C2@eris.apache.org> Author: ningjiang Date: Fri Nov 6 03:31:36 2009 New Revision: 833292 URL: http://svn.apache.org/viewvc?rev=833292&view=rev Log: Fixed the CS issues of camel-core Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=833292&r1=833291&r2=833292&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java Fri Nov 6 03:31:36 2009 @@ -391,8 +391,7 @@ * * @param test the test used to determine if the class matches * @param fqn the fully qualified name of a class - */ - @SuppressWarnings("unchecked") + */ protected void addIfMatching(PackageScanFilter test, String fqn, Set classes) { try { String externalName = fqn.substring(0, fqn.indexOf('.')).replace('/', '.'); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=833292&r1=833291&r2=833292&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Fri Nov 6 03:31:36 2009 @@ -135,8 +135,7 @@ public Map lookupByType(Class type) { return getCamelContext().getRegistry().lookupByType(type); } - - @SuppressWarnings("unchecked") + public void commit() { // now lets turn all of the event driven consumer processors into a single route if (!eventDrivenProcessors.isEmpty()) { Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=833292&r1=833291&r2=833292&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java Fri Nov 6 03:31:36 2009 @@ -57,11 +57,11 @@ ex = e; } finally { if (ex != null) { - try { - stop(childrenStarted); - } catch (Exception e) { - // Ignore exceptions as we want to show the original exception - } + try { + stop(childrenStarted); + } catch (Exception e) { + // Ignore exceptions as we want to show the original exception + } throw ex; } else { started.set(true); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java?rev=833292&r1=833291&r2=833292&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java Fri Nov 6 03:31:36 2009 @@ -58,7 +58,6 @@ * @throws java.io.IOException is thrown by the classloader */ @Override - @SuppressWarnings("unchecked") protected Enumeration getResources(ClassLoader loader, String packageName) throws IOException { // try super first, just in vase Enumeration enumeration = super.getResources(loader, packageName);