camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r680633 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/management/InstrumentationProcessor.java test/java/org/apache/camel/management/ExceptionWithManagementTest.java
Date Tue, 29 Jul 2008 06:52:02 GMT
Author: ningjiang
Date: Mon Jul 28 23:52:01 2008
New Revision: 680633

URL: http://svn.apache.org/viewvc?rev=680633&view=rev
Log:
CAMEL-765 Applied patch with thanks to William 

Added:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
  (with props)
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=680633&r1=680632&r2=680633&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
Mon Jul 28 23:52:01 2008
@@ -67,7 +67,7 @@
 
         try {
             processor.process(exchange);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             exchange.setException(e);
         }
 

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java?rev=680633&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
(added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
Mon Jul 28 23:52:01 2008
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management;
+
+import junit.framework.AssertionFailedError;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+
+/**
+ * A testcase for exception handler when management is enabled (by default).
+ * 
+ * @version $Revision$
+ */
+public class ExceptionWithManagementTest extends ContextTestSupport {
+    
+    
+    public void testExceptionHandler() throws Exception {
+        MockEndpoint error = this.resolveMandatoryEndpoint("mock:error", MockEndpoint.class);
+        error.expectedMessageCount(1);
+        
+        MockEndpoint out = this.resolveMandatoryEndpoint("mock:out", MockEndpoint.class);
+        out.expectedMessageCount(0);
+        
+        Exchange exchange = template.send("direct:start", ExchangePattern.InOnly, new Processor()
{    
+            public void process(Exchange exchange) throws Exception {
+                exchange.getIn().setBody("hello");
+            }
+
+        });
+        
+        Thread.sleep(2000);
+        error.assertIsSatisfied();
+        out.assertIsSatisfied();
+        
+    }
+    
+    
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+
+                exception(AssertionFailedError.class).maximumRedeliveries(1).to("mock:error");
+
+                from("direct:start").process(new Processor() {
+                    public void process(Exchange exchange) throws Exception {
+                        throw new AssertionFailedError("intentional error");
+                    }
+                }).to("mock:out");
+            }
+        };
+    }
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message