commit 12ca7f7808a49ab6eb358448ce6cbd60c749e8a8
author Stephan Wahlbrink <sw@wahlbrink.eu> Wed May 27 12:31:58 2020 +0200
committer Stephan Wahlbrink <sw@wahlbrink.eu> Fri May 29 10:50:33 2020 +0200
tree 9b81046193b5c39e3aca0ab80bab0a492b898dcf
parent 173eea1273b300572c3ab7e6b17734cafbf9b01d

Bug 563648: [RJ-Servi] Rearrange cleanup in RServiImpl.close

Change-Id: I1935ba0c9ec8dd36f3edf1d78e6f7ba5435e616a

servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/RServiImpl.java

diff --git a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/RServiImpl.java b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/RServiImpl.java
index 6b23de0..56ed8ec 100644
--- a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/RServiImpl.java
+++ b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/RServiImpl.java
@@ -184,6 +184,14 @@
 		this.rjs.setRjsProperties(properties);
 	}
 	
+	protected void dispose() {
+		RjsComConfig.unregisterClientComHandler(this.rjsId);
+		this.backend= null;
+		this.poolRef= null;
+		
+		this.rjs.disposeAllGraphics();
+	}
+	
 	@Override
 	public boolean isClosed() {
 		return this.rjs.isClosed();
@@ -205,10 +213,7 @@
 					e ));
 		}
 		finally {
-			this.poolRef= null;
-			this.backend= null;
-			RjsComConfig.unregisterClientComHandler(this.rjsId);
-			this.rjs.disposeAllGraphics();
+			dispose();
 		}
 	}