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

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

Author: timfox
Date: 2008-09-08 05:34:55 -0400 (Mon, 08 Sep 2008)
New Revision: 4917

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
Log:
Get xarecoverytest to run with invm transport


Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java	2008-09-08 05:54:42 UTC (rev 4916)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnection.java	2008-09-08 09:34:55 UTC (rev 4917)
@@ -55,4 +55,6 @@
    void destroy();      
    
    boolean isExpired(final long now);
+   
+   void startPinger();
 }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java	2008-09-08 05:54:42 UTC (rev 4916)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectionRegistryImpl.java	2008-09-08 09:34:55 UTC (rev 4917)
@@ -96,10 +96,12 @@
             throw new IllegalStateException("Failed to connect");
          }
          
-         RemotingConnectionImpl connection =
+         RemotingConnection connection =
             new RemotingConnectionImpl(tc, callTimeout, pingInterval, null, pingExecutor, null, null, true);
          
          handler.conn = connection;
+         
+         connection.startPinger();
                  
          holder = new ConnectionHolder(connection, connector);
   

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java	2008-09-08 05:54:42 UTC (rev 4916)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java	2008-09-08 09:34:55 UTC (rev 4917)
@@ -183,7 +183,7 @@
    
    private final ExecutorFactory executorFactory;
 
-   private final Runnable pinger;
+   private Runnable pinger;
    
    private final List<Interceptor> interceptors;
    
@@ -214,6 +214,10 @@
    // Constructors
    // ---------------------------------------------------------------------------------
 
+   private final long pingPeriod;
+   
+   private final ScheduledExecutorService pingExecutor;
+   
    public RemotingConnectionImpl(final Connection transportConnection,               
                                  final long blockingCallTimeout, final long pingPeriod,
                                  final ExecutorService handlerExecutor,
@@ -243,14 +247,21 @@
       this.client = client;
       
       this.writePackets = client || !backup;
+      
+      this.pingPeriod = pingPeriod;
+      
+      this.pingExecutor = pingExecutor;     
                   
       //Channel zero is reserved for pinging
       pingChannel = getChannel(0, false, -1);
       
       ChannelHandler ppHandler = new PingPongHandler();
       
-      pingChannel.setHandler(ppHandler);
-      
+      pingChannel.setHandler(ppHandler);           
+   }
+   
+   public void startPinger()
+   {
       if (pingPeriod != -1)
       {   
          pinger = new Pinger();
@@ -265,7 +276,7 @@
          pinger = null;
       }
    }
-
+   
    // RemotingConnection implementation
    // ------------------------------------------------------------
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java	2008-09-08 05:54:42 UTC (rev 4916)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java	2008-09-08 09:34:55 UTC (rev 4917)
@@ -70,13 +70,13 @@
       configuration = new ConfigurationImpl();
       configuration.setSecurityEnabled(false);
       configuration.setJournalMinFiles(2);
-      TransportConfiguration transportConfig = new TransportConfiguration("org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory");
+      TransportConfiguration transportConfig = new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory");
       configuration.getAcceptorConfigurations().add(transportConfig);
       messagingService = MessagingServiceImpl.newNioStorageMessagingServer(configuration, journalDir, bindingsDir);
       //start the server
       messagingService.start();
       //then we create a client as normal
-      sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.mina.MinaConnectorFactory"));
+      sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
       clientSession = sessionFactory.createSession(true, false, false, 1, false);
       clientSession.createQueue(atestq, atestq, null, true, true);
       clientProducer = clientSession.createProducer(atestq);
@@ -580,13 +580,14 @@
    {
       ClientMessage message = clientSession.createClientMessage(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
       message.getBody().putString(s);
+      message.getBody().flip();
       return message;
    }
 
    private void createClients()
          throws MessagingException
    {
-      sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.mina.MinaConnectorFactory"));
+      sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
       clientSession = sessionFactory.createSession(true, false, true, 1, false);
       clientProducer = clientSession.createProducer(atestq);
       clientConsumer = clientSession.createConsumer(atestq);