[Sunxacml-commit] sunxacml/com/sun/xacml AbstractPolicy.java,1.12,1.13

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

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

Modified Files:
	AbstractPolicy.java 
Log Message:
fixed a bug in encodeCommonElements where the wrong child list was used


Index: AbstractPolicy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/AbstractPolicy.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractPolicy.java	7 Jan 2005 23:46:32 -0000	1.12
--- AbstractPolicy.java	17 Feb 2005 15:58:24 -0000	1.13
***************
*** 94,100 ****
      private String defaultVersion;
  
!     // the elements we run through the combining algorithm and the same list
!     // paired with with their cooresponding elements
      private List children;
      private List childElements;
  
--- 94,101 ----
      private String defaultVersion;
  
!     // the child elements under this policy represented simply as the
!     // PolicyTreeElements...
      private List children;
+     // ...or the CombinerElements that are passed to combining algorithms
      private List childElements;
  
***************
*** 431,435 ****
       * contain both types of elements.
       *
!      * @param children the child elements used by the combining algorithm
       */
      protected void setChildren(List children) {
--- 432,438 ----
       * contain both types of elements.
       *
!      * @param children a <code>List</code> of <code>CombinerElement</code>s
!      *                 representing the child elements used by the combining
!      *                 algorithm
       */
      protected void setChildren(List children) {
***************
*** 502,506 ****
      protected void encodeCommonElements(OutputStream output,
                                          Indenter indenter) {
!         Iterator it = children.iterator();
          while (it.hasNext()) {
              ((CombinerElement)(it.next())).encode(output, indenter);
--- 505,509 ----
      protected void encodeCommonElements(OutputStream output,
                                          Indenter indenter) {
!         Iterator it = childElements.iterator();
          while (it.hasNext()) {
              ((CombinerElement)(it.next())).encode(output, indenter);