Fix signature of onReady callback

eu-nebulous · Oct 25, 2024 · 1de513e · 1de513e
1 parent 14793d3
commit 1de513e
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java b/optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/ExnConnector.java
@@ -58,15 +58,15 @@ public class ExnConnector {
      */
     public Context getContext() {
         if (context_ == null) {
-            // synchronized(this) {
-            //     while (context_ == null) {
-            //         try {
-	    //     	wait();
-	    //         } catch (InterruptedException e) {
-            //             log.error("Caught InterruptException while waiting for ActiveMQ connection Context; looping", e);
-	    //         }
-            //     }
-            // }
+            synchronized(this) {
+                while (context_ == null) {
+                    try {
+	        	wait();
+	            } catch (InterruptedException e) {
+                        log.error("Caught InterruptException while waiting for ActiveMQ connection Context; looping", e);
+	            }
+                }
+            }
         }
         return context_;
     }
@@ -146,11 +146,11 @@ public ExnConnector(String host, int port, String name, String password) {
         conn = new Connector(
             "optimiser_controller",
             new ConnectorHandler() {
-                public void onReady(AtomicReference<Context> context) {
-                    ExnConnector.this.context_ = context.get();
-                    // synchronized(ExnConnector.this) {
-                    //     ExnConnector.this.notifyAll();
-                    // }
+                public void onReady(Context context) {
+                    ExnConnector.this.context_ = context;
+                    synchronized(ExnConnector.this) {
+                        ExnConnector.this.notifyAll();
+                    }
                     log.info("Optimiser-controller connected to ActiveMQ, got connection context {}", context);
                 }
             },