From commits-return-12634-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu Dec 17 20:30:22 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 93908 invoked from network); 17 Dec 2009 20:30:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Dec 2009 20:30:22 -0000 Received: (qmail 10100 invoked by uid 500); 17 Dec 2009 20:30:22 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 10045 invoked by uid 500); 17 Dec 2009 20:30:22 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 10036 invoked by uid 99); 17 Dec 2009 20:30:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 20:30:22 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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; Thu, 17 Dec 2009 20:30:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3DCE92388AA9; Thu, 17 Dec 2009 20:30:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r891873 - in /activemq/sandbox/activemq-apollo-actor: activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java Date: Thu, 17 Dec 2009 20:30:00 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091217203000.3DCE92388AA9@eris.apache.org> Author: chirino Date: Thu Dec 17 20:29:59 2009 New Revision: 891873 URL: http://svn.apache.org/viewvc?rev=891873&view=rev Log: Fixing concurrency issue with the actor proxy. Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java?rev=891873&r1=891872&r2=891873&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/actor/ActorProxy.java Thu Dec 17 20:29:59 2009 @@ -22,7 +22,7 @@ return create(target.getClass().getClassLoader(), interfaceClass, target, queue); } - public static T create(ClassLoader classLoader, Class interfaceClass, T target, DispatchQueue queue) throws IllegalArgumentException { + synchronized public static T create(ClassLoader classLoader, Class interfaceClass, T target, DispatchQueue queue) throws IllegalArgumentException { Class proxyClass = getProxyClass(classLoader, interfaceClass); Constructor constructor = proxyClass.getConstructors()[0]; Object rc; Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java?rev=891873&r1=891872&r2=891873&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java Thu Dec 17 20:29:59 2009 @@ -34,7 +34,7 @@ */ public class MockBrokerTest extends TestCase { - protected static final int PERFORMANCE_SAMPLES = 30000000; + protected static final int PERFORMANCE_SAMPLES = 3; protected static final int SAMPLING_FREQUENCY = 5; protected static final int FANIN_COUNT = 10;