You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/06/26 14:01:32 UTC

svn commit: r550780 - /incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java

Author: gnodet
Date: Tue Jun 26 05:01:31 2007
New Revision: 550780

URL: http://svn.apache.org/viewvc?view=rev&rev=550780
Log:
SM-892: memory leak in org.apache.servicemix.bean.BeanEndpoint

Modified:
    incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java

Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?view=diff&rev=550780&r1=550779&r2=550780
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-bean/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Tue Jun 26 05:01:31 2007
@@ -255,7 +255,7 @@
                     }
                 }
             }
-            checkEndOfRequest(req);
+            checkEndOfRequest(req, corId);
             currentRequest.set(null);
         }
     }
@@ -279,7 +279,7 @@
             me.set(exchange);
             evaluateCallbacks(req);
         }
-        checkEndOfRequest(req);
+        checkEndOfRequest(req, corId);
         currentRequest.set(null);
     }
     
@@ -390,12 +390,12 @@
         }
     }
     
-    protected void checkEndOfRequest(Request request) {
+    protected void checkEndOfRequest(Request request, Object corId) {
         if (request.getExchange().getStatus() != ExchangeStatus.ACTIVE) {
             ReflectionUtils.callLifecycleMethod(request.getBean(), PreDestroy.class);
             request.setBean(null);
             request.setExchange(null);
-            requests.remove(request);
+            requests.remove(corId);
         }
     }