Change static class member of ConsoleHasLabel to non static, fixes ec…

…lipse-archived#2162 Signed-off-by: Ondrej Dockal <[email protected]>
odockal · Feb 25, 2022 · 1eb7ee1 · 1eb7ee1
1 parent c5a50ef
commit 1eb7ee1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...rg.eclipse.reddeer.eclipse/src/org/eclipse/reddeer/eclipse/condition/ConsoleHasLabel.java b/...rg.eclipse.reddeer.eclipse/src/org/eclipse/reddeer/eclipse/condition/ConsoleHasLabel.java
@@ -26,7 +26,7 @@
 public class ConsoleHasLabel extends AbstractWaitCondition {
 
 	private Matcher<String> matcher;
-	private static ConsoleView consoleView = null;
+	private ConsoleView consoleView;
 	private String resultLabel;
 
 	/**
@@ -53,7 +53,7 @@ public ConsoleHasLabel(Matcher<String> matcher) {
 	 */
 	@Override
 	public boolean test() {
-		String consoleLabel = ConsoleHasLabel.getConsoleLabel();
+		String consoleLabel = getConsoleLabel();
 		if (matcher.matches(consoleLabel)) {
 			this.resultLabel = consoleLabel;
 			return true;
@@ -69,11 +69,13 @@ public String description() {
 		return "console label matches '" + matcher ;
 	}
 
-	private static String getConsoleLabel() {
+	private String getConsoleLabel() {
 		if (consoleView == null){
 			consoleView = new ConsoleView();
 		}
-		consoleView.open();
+		if (!consoleView.isOpen()) {
+			consoleView.open();
+		}
 		return consoleView.getConsoleLabel();
 	}