[jboss-cvs] JBossCache/src/org/jboss/cache/factories ...

[Manik Surtani]

  User: msurtani
  Date: 07/06/08 05:46:53

  Modified:    src/org/jboss/cache/factories  XmlConfigurationParser.java
  Log:
  JBCACHE-1097
  
  Revision  Changes    Path
  1.22      +25 -20    JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XmlConfigurationParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/XmlConfigurationParser.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- XmlConfigurationParser.java	5 Jun 2007 02:59:02 -0000	1.21
  +++ XmlConfigurationParser.java	8 Jun 2007 09:46:53 -0000	1.22
  @@ -110,7 +110,7 @@
       * 1.x releases and no longer are.  Log a WARN or throw a 
       * {@link ConfigurationException} if any are found. Which is done depends
       * on the attribute:
  -    * <p>
  +    * <p/>
       * <ul>
       * <li><i>MultiplexerService</i> -- throws an Exception</li>
       * <li><i>ServiceName</i> -- logs a WARN</li>
  @@ -148,7 +148,7 @@
       * Check for any attributes that were supported in the
       * 1.x releases but whose name has changed.  Log a WARN if any are found, but
       * convert the attribute to the new name.
  -    * <p>
  +    * <p/>
       * <ul>
       * <li><i>UseMbean</i> becomes <i>ExposeManagementStatistics</i></li>
       * </ul>
  @@ -177,7 +177,13 @@
   
      protected InputStream getAsInputStreamFromClassLoader(String filename)
      {
  -      return Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
  +      InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
  +      if (is == null)
  +      {
  +         // check system class loader
  +         is = getClass().getClassLoader().getResourceAsStream(filename);
  +      }
  +      return is;
      }
   
      protected Element getMBeanElement(Element root)
  @@ -644,7 +650,6 @@
      }
      
      
  -
      private static String getSetterName(String propName)
      {
         StringBuffer sb = new StringBuffer("set");