Changeset 2141

Timestamp:

2001-03-09T11:49:24+13:00 (22 years ago)

Author:

say1

Message:

bug fix

File:

• trunk/java-client/org/nzdl/gsdl/util/NzdlIORs.java (modified) (6 diffs)

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

@@ -142 +142 @@
     }
       } catch (ClassNotFoundException exception) {
-    System.err.println("Error locking class:" + exception);
-      }
-      
-      
+    System.err.println("Exception locking class:" + exception);
+      }
+      
+      
+      try {
       File file = new File(propertiesFileName);
-      try {
     if (file.exists()) {
       knownIORs.load(new FileInputStream(file));
     } 
       } catch (IOException exception) {
-    System.err.println("Error reading properties file:" + exception);
+    System.err.println("Exception reading properties file:" + exception);
       }
     }
@@ -254 +254 @@
     }
       } catch (ClassNotFoundException exception) {
-    System.err.println("Error locking class:" + exception);
+    System.err.println("Exception locking class:" + exception);
       }
       checkSave();
@@ -269 +269 @@
   {
     checkLoaded();    
-    synchronized (knownIORs) {
-      knownIORs.put(str,"");
-    }
+    if (str != null)
+      synchronized (knownIORs) {
+    knownIORs.put(str,"");
+      }
     checkSave();
     return str;
@@ -295 +296 @@
       ior = dhis.readLine();
 
-      synchronized (knownIORs) {
-    knownIORs.put(ior,"");
-      }      
+      if (ior != null)
+    synchronized (knownIORs) {
+      knownIORs.put(ior,"");
+    }      
       checkSave();
       return ior;
@@ -326 +328 @@
       System.err.println("Error reading IOR file:\n" + e);
     }
-    synchronized (knownIORs) {
-      knownIORs.put(ior,"");
-    }
+    if (ior != null)
+      synchronized (knownIORs) {
+    knownIORs.put(ior,"");
+      }
     checkSave();
     return ior;
@@ -343 +346 @@
   public static void  writeToFile(String file) {
     checkLoaded();
-    synchronized (knownIORs) {
-      String ior = null;
-      file = file.trim();
-      try  {
-    BufferedWriter output
-      = new BufferedWriter(new FileWriter(file));
-    Enumeration e = knownIORs.keys();
-    while (e.hasMoreElements()) {
-      String IOR = (String) e.nextElement();
-      output.write(IOR);
-      output.newLine();
-    } 
-      } catch (java.io.IOException e) {
-    System.err.println("Error reading IOR file:\n" + e);
-      }
-    }
+    if (file != null)
+      synchronized (knownIORs) {
+    String ior = null;
+    file = file.trim();
+    try  {
+      BufferedWriter output
+        = new BufferedWriter(new FileWriter(file));
+      Enumeration e = knownIORs.keys();
+      while (e.hasMoreElements()) {
+        String IOR = (String) e.nextElement();
+        output.write(IOR);
+        output.newLine();
+      } 
+    } catch (java.io.IOException e) {
+      System.err.println("Error reading IOR file:\n" + e);
+    }
+      }
   }   // end of getIorKey
-
+  
 
   /**