Changeset 2192 for trunk/java-client/org

Timestamp:

2001-03-18T20:25:21+12:00 (23 years ago)

Author:

say1

Message:

fixed a buf when no IORs were found ...

File:

• trunk/java-client/org/nzdl/gsdl/util/NzdlServiceFactory.java (modified) (4 diffs)

trunk/java-client/org/nzdl/gsdl/util/NzdlServiceFactory.java

@@ -247 +247 @@
     if (client == null) {
       String[] IORs = NzdlServiceFactory.getIORsfromFile(_filename);
-      for (int i=0;( i<IORs.length && client == null );i++) {
+      for (int i=0;(IORs != null && i<IORs.length && client == null );i++) {
     client = attemptToInitialise(_args, _props,IORs[i]);
       }
@@ -253 +253 @@
     
     // try the compiled-in URLs
-    if (client == null) {
+    if (client == null && urlsCompiledIn != null) {
       for (int i=0;( i<urlsCompiledIn.length && client == null );i++) {
     String[] IORs = NzdlServiceFactory.getIORsfromURL(urlsCompiledIn[i]);
-    for (int j=0;( j<IORs.length && client == null );j++) {
+    for (int j=0;(IORs != null && j<IORs.length && client == null );j++) {
       client = attemptToInitialise(_args, _props,IORs[j]);
     }
@@ -412 +412 @@
       System.err.println("NzdlHosts::getIOR() unable to construct or read URL \"" +
              str + "\", \"" + ior + "\": " + throwable);
-      return null;
+      return new String[0];
     }
   }
@@ -457 +457 @@
       System.err.println("Error reading IOR file:\n" + e);
     }
-    return null;
-  }   // end of getIorKey
+    return new String[0];
+  }  
 
   /**