[jbosstools-commits] JBoss Tools SVN: r41035 - in trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71: src/org/jboss/ide/eclipse/as/internal/management/as71 and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-05-16 01:32:02 -0400 (Wed, 16 May 2012)
New Revision: 41035

Added:
   trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.7.GA.jar
Removed:
   trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
   trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
Log:
JBIDE-11871 to trunk

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath	2012-05-15 23:20:05 UTC (rev 41034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath	2012-05-16 05:32:02 UTC (rev 41035)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/>
+	<classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol/src"/>
 	<classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.9.GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.2.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="xnio-api-3.0.3.GA.jar"/>
@@ -13,5 +12,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="jboss-remoting-3.2.7.GA.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.2.GA.jar
===================================================================
(Binary files differ)

Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.7.GA.jar
===================================================================
(Binary files differ)


Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/jboss-remoting-3.2.7.GA.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java	2012-05-15 23:20:05 UTC (rev 41034)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java	2012-05-16 05:32:02 UTC (rev 41035)
@@ -264,13 +264,42 @@
 	}
 
 	public void dispose() {
-		new Thread("Closing AS7 Management Streams") {
+		if( client != null ) {
+			closeClient(client);
+		}
+	}
+	// Launch a thread to handle the close to ensure dispose() is immediate
+	private void closeClient(final ModelControllerClient client) {
+		Thread t = new Thread("Closing client") {
 			public void run() {
-				StreamUtils.safeClose(client);
+				closeClientJoin(client);
 			}
-		}.start();
+		};
+		t.start();
 	}
+	
+	// Launch a new thread with max duration 5s to handle the actual close
+	private void closeClientJoin(final ModelControllerClient client) {
+		Runnable r = new Runnable() {
+			  public void run() {
+			    try {
+			        client.close();
+			    } catch (Exception e) {
+			       // trace
+			    }
+			  }
+			};
 
+			Thread t = new Thread(r);
+			try {
+			  t.start();
+			  t.join(5000);
+			} catch (InterruptedException e) {
+			} finally {
+			  t.interrupt();
+			}
+	}
+
 	/*package*/ ModelNode execute(ModelNode node) throws JBoss7ManangerException {
 		try {
 			ModelNode response = client.execute(node);