fixup! Make OpenShiftClient one per che server

infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftClientFactory.java

@@ -14,6 +14,7 @@
 
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.openshift.client.OpenShiftConfigBuilder;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -30,7 +31,7 @@ public class OpenShiftClientFactory {
 
   private static final Logger LOG = LoggerFactory.getLogger(OpenShiftClientFactory.class);
 
-  private final OpenShiftClient client;
+  private final UnclosedOpenShiftClient client;
 
   @Inject
   public OpenShiftClientFactory(
@@ -59,7 +60,7 @@ public OpenShiftClientFactory(
     if (doTrustCerts != null) {
       configBuilder.withTrustCerts(doTrustCerts);
     }
-    this.client = new DefaultOpenShiftClient(configBuilder.build());
+    this.client = new UnclosedOpenShiftClient(configBuilder.build());
   }
 
   /**
@@ -74,9 +75,24 @@ public OpenShiftClient create() throws InfrastructureException {
   @PreDestroy
   public void cleanup() {
     try {
-      client.close();
+      client.doClose();
     } catch (RuntimeException ex) {
       LOG.error(ex.getMessage());
     }
   }
+
+  /** Decorates the {@link DefaultOpenShiftClient} so that it can not be closed from the outside. */
+  private static class UnclosedOpenShiftClient extends DefaultOpenShiftClient {
+
+    public UnclosedOpenShiftClient(OpenShiftConfig build) {
+      super(build);
+    }
+
+    @Override
+    public void close() {}
+
+    void doClose() {
+      super.close();
+    }
+  }
 }