[jboss-cvs] JBoss Messaging SVN: r7232 - in trunk: src/main/org/jboss/messaging/core/server/impl and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2009-06-06 14:29:49 -0400 (Sat, 06 Jun 2009)
New Revision: 7232

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
Log:
fixed deadlock in pinger

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java	2009-06-05 22:29:37 UTC (rev 7231)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/Pinger.java	2009-06-06 18:29:49 UTC (rev 7232)
@@ -41,23 +41,23 @@
 {
    private static final Logger log = Logger.getLogger(Pinger.class);
    
-   private boolean closed;
+   private volatile boolean closed;
 
    private RemotingConnection conn;
 
-   private Future<?> future;
+   private volatile Future<?> future;
 
    public Pinger(final RemotingConnection conn)
    {
       this.conn = conn;
    }
 
-   public synchronized void setFuture(final Future<?> future)
+   public void setFuture(final Future<?> future)
    {
       this.future = future;
    }
 
-   public synchronized void run()
+   public void run()
    {
       if (closed)
       {
@@ -85,7 +85,7 @@
       conn.clearDataSent();
    }
 
-   public synchronized void close()
+   public void close()
    {
       future.cancel(false);
 

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-05 22:29:37 UTC (rev 7231)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-06 18:29:49 UTC (rev 7232)
@@ -527,7 +527,7 @@
                                                      final int sendWindowSize) throws Exception
    {
       checkActivate(connection);
-
+      
       return doCreateSession(name,
                              channelID,
                              replicatedChannelID,

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2009-06-05 22:29:37 UTC (rev 7231)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2009-06-06 18:29:49 UTC (rev 7232)
@@ -269,6 +269,7 @@
    }
    
    // This test is to check netty issue in https://jira.jboss.org/jira/browse/JBMESSAGING-1618   
+   
    public void testConnectionListenerBug() throws Exception
    {
       for (int i = 0; i < 10000; i++)