From commits-return-19443-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Aug 1 10:50:31 2012 Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85673DA4A for ; Wed, 1 Aug 2012 10:50:31 +0000 (UTC) Received: (qmail 37537 invoked by uid 500); 1 Aug 2012 10:50:31 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 37443 invoked by uid 500); 1 Aug 2012 10:50:30 -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 37402 invoked by uid 99); 1 Aug 2012 10:50:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 10:50:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 01 Aug 2012 10:50:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1D37C23888E4 for ; Wed, 1 Aug 2012 10:49:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1367915 - /activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java Date: Wed, 01 Aug 2012 10:49:40 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120801104940.1D37C23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Wed Aug 1 10:49:39 2012 New Revision: 1367915 URL: http://svn.apache.org/viewvc?rev=1367915&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3955 - web socket transport race condition Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java?rev=1367915&r1=1367914&r2=1367915&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/ws/StompSocket.java Wed Aug 1 10:49:39 2012 @@ -18,6 +18,7 @@ package org.apache.activemq.transport.ws import java.io.IOException; import java.security.cert.X509Certificate; +import java.util.concurrent.CountDownLatch; import org.apache.activemq.command.Command; import org.apache.activemq.transport.TransportSupport; @@ -30,14 +31,19 @@ import org.apache.activemq.util.ByteSequ import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.ServiceStopper; import org.eclipse.jetty.websocket.WebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implements web socket and mediates between servlet and the broker */ class StompSocket extends TransportSupport implements WebSocket.OnTextMessage, StompTransport { + private static final Logger LOG = LoggerFactory.getLogger(StompSocket.class); + Connection outbound; ProtocolConverter protocolConverter = new ProtocolConverter(this, null); StompWireFormat wireFormat = new StompWireFormat(); + private final CountDownLatch socketTransportStarted = new CountDownLatch(1); @Override public void onOpen(Connection connection) { @@ -50,6 +56,17 @@ class StompSocket extends TransportSuppo @Override public void onMessage(String data) { + + if (!transportStartedAtLeastOnce()) { + LOG.debug("Waiting for StompSocket to be properly started..."); + try { + socketTransportStarted.await(); + } catch (InterruptedException e) { + LOG.warn("While waiting for StompSocket to be properly started, we got interrupted!! Should be okay, but you could see race conditions..."); + } + } + + try { protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8")))); } catch (Exception e) { @@ -57,8 +74,13 @@ class StompSocket extends TransportSuppo } } + private boolean transportStartedAtLeastOnce() { + return socketTransportStarted.getCount() == 0; + } + @Override protected void doStart() throws Exception { + socketTransportStarted.countDown(); } @Override