[Sunxacml-commit] sunxacml/com/sun/xacml ConfigurationStore.java,1.9,1.10

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15290/com/sun/xacml

Modified Files:
	ConfigurationStore.java 
Log Message:
merged in small bug fixes from the 1.2 branch


Index: ConfigurationStore.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ConfigurationStore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConfigurationStore.java	13 Jul 2004 22:39:34 -0000	1.9
--- ConfigurationStore.java	17 Feb 2005 16:01:25 -0000	1.10
***************
*** 3,7 ****
   * @(#)ConfigurationStore.java
   *
!  * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)ConfigurationStore.java
   *
!  * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 145,148 ****
--- 145,151 ----
      private HashMap functionMap;
  
+     // the classloader we'll use for loading classes
+     private ClassLoader loader;
+ 
      // the logger we'll use for all messages
      private static final Logger logger =
***************
*** 211,214 ****
--- 214,220 ----
          logger.config("Loading runtime configuration");
  
+         // load our classloader
+         loader = getClass().getClassLoader();
+ 
          // get the root node from the configuration file
          Node root = getRootNode(configFile);
***************
*** 584,592 ****
              logger.config("Loading [ " + prefix + ": " + className + " ]");
  
!         // use the system classloader to load the given class
!         ClassLoader cl = ClassLoader.getSystemClassLoader();
          Class c = null;
          try {
!             c = cl.loadClass(className);
          } catch (ClassNotFoundException cnfe) {
              throw new ParsingException("couldn't load class " + className,
--- 590,597 ----
              logger.config("Loading [ " + prefix + ": " + className + " ]");
  
!         // load the given class using the local classloader
          Class c = null;
          try {
!             c = loader.loadClass(className);
          } catch (ClassNotFoundException cnfe) {
              throw new ParsingException("couldn't load class " + className,