From 2355a6bf8a22dd0c23c61647782f8dfbf150b060 Mon Sep 17 00:00:00 2001
From: Rasha Djurdjevic <radomir.djurdjevic@outlook.com>
Date: Thu, 7 Jan 2021 01:55:49 +0100
Subject: [PATCH] #1 #2 #5 change RMI export port to 0, unexport Registry when
 shutting down Nameservers

---
 .../java/dslab/nameserver/Nameserver.java     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/dslab/nameserver/Nameserver.java b/src/main/java/dslab/nameserver/Nameserver.java
index 9d42995..3acf693 100644
--- a/src/main/java/dslab/nameserver/Nameserver.java
+++ b/src/main/java/dslab/nameserver/Nameserver.java
@@ -47,7 +47,7 @@ public class Nameserver implements INameserver {
             // Root Nameserver
             nameServerLocal = new NameServerRemote("root");
             try {
-                nameserverRemote = (INameserverRemote) UnicastRemoteObject.exportObject(nameServerLocal, registryPort);
+                nameserverRemote = (INameserverRemote) UnicastRemoteObject.exportObject(nameServerLocal, 0);
                 registry = LocateRegistry.createRegistry(registryPort);
                 registry.rebind(registryName, nameserverRemote);
                 System.out.println("Nameserver bound.");
@@ -62,6 +62,7 @@ public class Nameserver implements INameserver {
             try {
                 registry = LocateRegistry.getRegistry(registryHost, registryPort);
                 nameserverRemote = (INameserverRemote) registry.lookup(registryName);
+                UnicastRemoteObject.exportObject(nameServerLocal, 0);
                 nameserverRemote.registerNameserver(domain, nameServerLocal);
             } catch (RemoteException | NotBoundException e) {
                 e.printStackTrace();
@@ -107,20 +108,20 @@ public class Nameserver implements INameserver {
     public void shutdown() {
         // shell is already interrupted
         // so just close other things
+        try {
+            UnicastRemoteObject.unexportObject(nameServerLocal, true);
+        } catch (NoSuchObjectException e) {
+            e.printStackTrace();
+        }
+
         if (this.componentId.equals("ns-root")) {
             try {
-                registry.unbind(registryName);
-                UnicastRemoteObject.unexportObject(nameServerLocal, true);
-            } catch (RemoteException e) {
-                e.printStackTrace();
-            } catch (NotBoundException e) {
+                this.registry.unbind(registryName);
+                UnicastRemoteObject.unexportObject(this.registry, true);
+            } catch(RemoteException | NotBoundException e){
                 e.printStackTrace();
             }
-        } else {
-            this.nameservers();
-            System.out.println("Zone Nameserver...");
         }
-        System.out.println("Nameserver shut down successfully!");
     }
 
     public static void main(String[] args) throws Exception {