Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 50981 invoked from network); 2 Mar 2009 16:49:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Mar 2009 16:49:16 -0000 Received: (qmail 4326 invoked by uid 500); 2 Mar 2009 16:49:16 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 4299 invoked by uid 500); 2 Mar 2009 16:49:16 -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 4290 invoked by uid 99); 2 Mar 2009 16:49:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2009 08:49:15 -0800 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; Mon, 02 Mar 2009 16:49:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DAFDA2388BD8; Mon, 2 Mar 2009 16:48:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749357 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: converter/jaxp/XmlConverter.java processor/DelayProcessorSupport.java view/GraphGeneratorSupport.java Date: Mon, 02 Mar 2009 16:48:54 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090302164854.DAFDA2388BD8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Mon Mar 2 16:48:54 2009 New Revision: 749357 URL: http://svn.apache.org/viewvc?rev=749357&view=rev Log: CAMEL-588: Fixed package tangling and wrong logger class used. Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=749357&r1=749356&r2=749357&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Mon Mar 2 16:48:54 2009 @@ -53,8 +53,7 @@ import org.xml.sax.XMLReader; import org.apache.camel.Converter; -import org.apache.camel.converter.IOConverter; -import org.apache.camel.converter.NIOConverter; +import org.apache.camel.Exchange; import org.apache.camel.util.ObjectHelper; @@ -292,17 +291,19 @@ } @Converter - public StreamSource toStreamSource(byte[] in) throws TransformerException { + public StreamSource toStreamSource(byte[] in, Exchange exchange) throws TransformerException { if (in != null) { - return new StreamSource(IOConverter.toInputStream(in)); + InputStream is = exchange.getContext().getTypeConverter().convertTo(InputStream.class, in); + return new StreamSource(is); } return null; } @Converter - public StreamSource toStreamSource(ByteBuffer in) throws TransformerException { + public StreamSource toStreamSource(ByteBuffer in, Exchange exchange) throws TransformerException { if (in != null) { - return new StreamSource(NIOConverter.toInputStream(in)); + InputStream is = exchange.getContext().getTypeConverter().convertTo(InputStream.class, in); + return new StreamSource(is); } return null; } Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java?rev=749357&r1=749356&r2=749357&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java Mon Mar 2 16:48:54 2009 @@ -32,7 +32,7 @@ * @version $Revision$ */ public abstract class DelayProcessorSupport extends DelegateProcessor { - private static final transient Log LOG = LogFactory.getLog(Delayer.class); + protected final transient Log log = LogFactory.getLog(getClass()); private CountDownLatch stoppedLatch = new CountDownLatch(1); private boolean fastStop = true; @@ -95,8 +95,8 @@ if (delay <= 0) { return; } - if (LOG.isTraceEnabled()) { - LOG.trace("Sleeping for: " + delay + " millis"); + if (log.isTraceEnabled()) { + log.trace("Sleeping for: " + delay + " millis"); } if (isFastStop()) { stoppedLatch.await(delay, TimeUnit.MILLISECONDS); @@ -110,7 +110,9 @@ * case differently */ protected void handleSleepInteruptedException(InterruptedException e) { - LOG.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped())); + if (log.isDebugEnabled()) { + log.debug("Sleep interrupted, are we stopping? " + (isStopping() || isStopped())); + } } protected long currentSystemTime() { Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java?rev=749357&r1=749356&r2=749357&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java Mon Mar 2 16:48:54 2009 @@ -43,7 +43,7 @@ * @version $Revision$ */ public abstract class GraphGeneratorSupport { - private static final transient Log LOG = LogFactory.getLog(RouteDotGenerator.class); + protected final transient Log log = LogFactory.getLog(getClass()); protected String dir; protected int clusterCounter; protected String extension;