Changeset 2130 for trunk/java-client/org

Timestamp:

2001-03-08T01:41:37+13:00 (23 years ago)

Author:

say1

Message:

fixed teh error where bad or old IORs would cause a crash

Location:

trunk/java-client/org/nzdl/gsdl

Files:

• SimpleClient.java (modified) (4 diffs)
• service/NzdlServiceClient.java (modified) (2 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleClient.java

@@ -93 +93 @@
   String IORFromCommandLine = null;
   /** The collection to query */
-  String collectionNameToQuery = "demo";
+  String collectionNameToQuery = "";
   /** The query to use */
   String queryToQuery = "the";
@@ -138 +138 @@
       System.err.println("Error reading properties file:" + i);
     }
-
-    Enumeration e = knownIORs.keys();
-    while (e.hasMoreElements() && nzdl == null) {
-      String IOR = (String) e.nextElement();
-      attemptToInitialise(args, null, IOR);
-      
-    }
+    
+    if (IORFromCommandLine != null)
+      attemptToInitialise(args, null, IORFromCommandLine);
     
     if (nzdl == null) {
@@ -151 +147 @@
       System.err.println("after IOR");
       attemptToInitialise(args, null, IOR);
-      knownIORs.put(IOR,"");
-    }
-
+    }
+    
+    Enumeration e = knownIORs.keys();
+    while (e.hasMoreElements() && nzdl == null) {
+      String IOR = (String) e.nextElement();
+      attemptToInitialise(args, null, IOR);
+      
+    }
+    
+    knownIORs.put(IOR,"");
   }
 
@@ -202 +205 @@
     catch (java.io.IOException e) {
       System.err.println("Error reading IOR key:\n" + e);
-      System.err.println("Aborting service...");
-      System.exit(1);
     }
     return ior;

trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

@@ -38 +38 @@
     System.err.println("Nzdl init ... NO");
     System.err.println("CORBA error:" + error.value.value());
-    System.err.println("Aborting service ...");
-    System.exit(1);
+    throw new Error("Initialisation failed ...");
       }
       
@@ -45 +44 @@
       System.err.println("Error in service init:\n" + e) ;
       System.err.println("CORBA error:" + error.value.value());
-      System.err.println("Aborting service ...");
-      System.exit(1);
+      throw new Error("Initialisation failed ...");
     }
     if (error.value.value() != corbaComError._corbaNoError) {