[jboss-cvs] JBossAS SVN: r84448 - in projects/vfs/trunk/src/main/java/org/jboss/virtual: plugins/context and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-02-19 05:38:18 -0500 (Thu, 19 Feb 2009)
New Revision: 84448

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java
Log:
Optimize option check a bit.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2009-02-19 09:34:24 UTC (rev 84447)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2009-02-19 10:38:18 UTC (rev 84448)
@@ -559,7 +559,8 @@
     */
    public static String getOption(VirtualFile file, String key)
    {
-      return getOption(file, key, String.class);
+      Object option = getOption(file, key, Object.class);
+      return option != null ? option.toString() : null;
    }
 
    /**
@@ -571,7 +572,8 @@
     */
    public static String getOption(VFS vfs, String key)
    {
-      return getOption(vfs, key, String.class);
+      Object option = getOption(vfs, key, Object.class);
+      return option != null ? option.toString() : null;
    }
 
    /**
@@ -616,7 +618,7 @@
       if (options == null)
          throw new IllegalArgumentException("Cannot enable " + optionName + " on null options: " + file);
 
-      options.addOption(optionName, Boolean.TRUE.toString());
+      options.addOption(optionName, Boolean.TRUE);
    }
 
    /**
@@ -646,7 +648,7 @@
       if (options == null)
          throw new IllegalArgumentException("Cannot enable " + optionName + " on null options: " + vfs);
 
-      options.addOption(optionName, Boolean.TRUE.toString());
+      options.addOption(optionName, Boolean.TRUE);
    }
 
    /**

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java	2009-02-19 09:34:24 UTC (rev 84447)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DefaultOptions.java	2009-02-19 10:38:18 UTC (rev 84448)
@@ -178,6 +178,13 @@
    public boolean getBooleanOption(String name)
    {
       Object option = getOption(name);
-      return Boolean.parseBoolean(String.valueOf(option));
+      if (option != null)
+      {
+         if (option instanceof Boolean)
+            return (Boolean)option;
+         else if (option instanceof String)
+            return Boolean.parseBoolean(String.valueOf(option));
+      }
+      return false;
    }
 }