[jboss-svn-commits] JBL Code SVN: r34429 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-services/src/main/java/org/drools/grid/services and 1 other directory.

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

Author: salaboy21
Date: 2010-07-31 15:23:43 -0400 (Sat, 31 Jul 2010)
New Revision: 34429

Modified:
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java
   labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java
Log:
changing remote connection to do nothing if it's already connected. removing Sysos in GridTopology

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java	2010-07-30 23:01:09 UTC (rev 34428)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/RemoteMinaNodeConnector.java	2010-07-31 19:23:43 UTC (rev 34429)
@@ -56,8 +56,8 @@
 
     public void connect() throws ConnectorException {
         if (session != null && session.isConnected()) {
-           
-            throw new IllegalStateException("Already connected. Disconnect first.");
+            return;
+            //throw new IllegalStateException("Already connected. Disconnect first.");
         }
 
         try {
@@ -81,9 +81,10 @@
     public void disconnect() throws ConnectorException {
         this.connector.getFilterChain().clear();
         if (session != null && session.isConnected()) {
-            session.close();
+            session.close(false);
             session.getCloseFuture().join();
         }
+        //this.connector.dispose();
     }
 
     private void addResponseHandler(int id,

Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java	2010-07-30 23:01:09 UTC (rev 34428)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/GridTopology.java	2010-07-31 19:23:43 UTC (rev 34429)
@@ -201,7 +201,7 @@
     
 
     public void dispose() throws ConnectorException, RemoteException {
-        System.out.println("Dispose all connections!");
+        
         for (String key : executionEnvironments.keySet()) {
             executionEnvironments.get(key).getConnector().disconnect();
             executionEnvironments.get(key).getConnector().getConnection().dispose();