Skip to content

Commit

Permalink
CAMEL-10048: Fixed memory leak in routing slip. Thanks to Arseniy Tas…
Browse files Browse the repository at this point in the history
…hoyan for the patch.
  • Loading branch information
davsclaus committed Jun 12, 2016
1 parent 40cda47 commit e389069
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private AsyncProcessorConverterHelper() {
* It is important that this implements {@link DelegateProcessor}
*/
private static final class ProcessorToAsyncProcessorBridge implements DelegateProcessor, AsyncProcessor, Navigate<Processor>, Service {
protected Processor processor;
protected final Processor processor;

private ProcessorToAsyncProcessorBridge(Processor processor) {
this.processor = processor;
Expand Down Expand Up @@ -113,6 +113,24 @@ public List<Processor> next() {
public Processor getProcessor() {
return processor;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}

ProcessorToAsyncProcessorBridge that = (ProcessorToAsyncProcessorBridge) o;
return processor.equals(that.processor);
}

@Override
public int hashCode() {
return processor.hashCode();
}
}

public static AsyncProcessor convert(Processor value) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/**
* 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.issues;

import java.lang.reflect.Field;
import java.util.Map;

import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.RoutingSlip;

public class RoutingSlipMemoryLeakTest extends ContextTestSupport {

@Override
protected void setUp() throws Exception {
deleteDirectory("target/output");
super.setUp();
}

/**
* Reproducer for the memory leak: CAMEL-10048
*/
public void testMemoryLeakInExceptionHandlerCaching() throws Exception {
int messageCount = 100;
for (int i = 0; i < messageCount; i++) {
template.sendBody("direct:start", "message " + i);
}
RoutingSlip routingSlip = context.getProcessor("memory-leak", RoutingSlip.class);
Map errorHandlers = getRoutingSlipErrorHandlers(routingSlip);
assertEquals("Error handlers cache must contain only one value", 1, errorHandlers.size());
}

@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:start")
.routingSlip(method(SlipProvider.class)).id("memory-leak");
}
};
}

private Map<?, ?> getRoutingSlipErrorHandlers(RoutingSlip routingSlip) throws Exception {
Field errorHandlersField = routingSlip.getClass().getDeclaredField("errorHandlers");
errorHandlersField.setAccessible(true);
Map errorHandlers = (Map) errorHandlersField.get(routingSlip);
return errorHandlers;
}

public static class SlipProvider {

public String computeSlip(String body) {
/*
* It is important to have a processor here, that does not extend
* AsyncProcessor. Only in this case
* AsyncProcessorConverterHelper.convert() creates a new object,
* thus leading to a memory leak. For example, if you replace file
* endpoint with mock endpoint, then everything goes fine, because
* MockEndpoint.createProducer() creates an implementation of
* AsyncProcessor.
*/
return "file:target/output";
}
}
}

0 comments on commit e389069

Please sign in to comment.