perfsonar development work

Author: roman
Date: 2009-03-10 09:40:19 -0400 (Tue, 10 Mar 2009)
New Revision: 5048

Modified:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/configuration/OptionEntry.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
Log:

now getOption method  reterns null instead of throwing an exception



Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/configuration/OptionEntry.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/configuration/OptionEntry.java
     2009-03-10 11:27:37 UTC (rev 5047)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/configuration/OptionEntry.java
     2009-03-10 13:40:19 UTC (rev 5048)
@@ -35,23 +35,20 @@
 
 
     public void addOption(String name, String value) {
-       Option option = new Option(name, value);
-       options.put(name, option);
+        Option option = new Option(name, value);
+        options.put(name, option);
     }
 
     public void addOption(Option option) {
-       options.put(option.getName(), option);
+        options.put(option.getName(), option);
     } 
 
-    public Option getOption(String name) throws PerfSONARException {
-       Option option = (Option)options.get(name);
-       if (option == null)
-            throw new PerfSONARException(
-                    "error/configuration",
-                    "Could not find an option " + name + " in the 
configuration");
-        return option;
+
+    public Option getOption(String name) {
+        return ((Option)options.get(name));
     }
 
+
     public Map getOptions() {
         return options;
     }

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
     2009-03-10 11:27:37 UTC (rev 5047)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
     2009-03-10 13:40:19 UTC (rev 5048)
@@ -232,7 +232,7 @@
             className = getOption("registerDataSource").getValue();
             if (className == null || className.trim().equals(""))
                 logger.warn("registerDataSource option of register action is 
empty");
-            } catch (PerfSONARException pex) {
+        } catch (Exception pex) {
                 logger.warn("registerDataSource option of register action is 
missing");
         }
 
@@ -402,7 +402,7 @@
     }
 
 
-    protected int getRefreshParameter() throws PerfSONARException {
+    protected int getRefreshParameter() {
 
         int refresh = DEFAULT_REFRESH;
         try {
@@ -410,7 +410,7 @@
             refresh = Integer.parseInt(refershStr);
         } catch (NumberFormatException ex1) {
             logger.warn("Wrong format of register refresh parameter.");
-        } catch (PerfSONARException ex2) {
+        } catch (Exception ex2) {
             logger.debug("Default value of refresh parameter is taken.");
         }
         return refresh;