servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r414218 - in /incubator/servicemix/trunk: pom.xml servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
Date Wed, 14 Jun 2006 12:27:06 GMT
Author: gnodet
Date: Wed Jun 14 05:27:06 2006
New Revision: 414218

URL: http://svn.apache.org/viewvc?rev=414218&view=rev
Log:
Upgrade to jetty-beta17, fix big memory leak

Modified:
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=414218&r1=414217&r2=414218&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed Jun 14 05:27:06 2006
@@ -1060,7 +1060,7 @@
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
-        <version>6.0.0beta15</version>
+        <version>6.0.0beta17</version>
       </dependency>
       <dependency>
         <groupId>jgroups</groupId>

Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java?rev=414218&r1=414217&r2=414218&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java
(original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java
Wed Jun 14 05:27:06 2006
@@ -398,6 +398,10 @@
 
         public void join() throws InterruptedException {
         }
+
+        public boolean isLowOnThreads() {
+            return threadPool.isLowOnThreads();
+        }
     }
 
 }

Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java?rev=414218&r1=414217&r2=414218&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
(original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
Wed Jun 14 05:27:06 2006
@@ -176,7 +176,7 @@
             }
         } else {
             String id = (String) request.getAttribute(MessageExchange.class.getName());
-            exchange = (MessageExchange) exchanges.get(id);
+            exchange = (MessageExchange) exchanges.remove(id);
             request.removeAttribute(MessageExchange.class.getName());
             boolean result = cont.suspend(0); 
             // Check if this is a timeout



Mime
View raw message