[jboss-cvs] Picketbox SVN: r165 - tags/4.0.0.Alpha3/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login.

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

Author: mmoyses
Date: 2011-02-01 11:41:17 -0500 (Tue, 01 Feb 2011)
New Revision: 165

Modified:
   tags/4.0.0.Alpha3/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
Log:
Parsing with XMLStreamReader

Modified: tags/4.0.0.Alpha3/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
===================================================================
--- tags/4.0.0.Alpha3/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/JASPIAuthenticationInfo.java	2011-02-01 16:19:24 UTC (rev 164)
+++ tags/4.0.0.Alpha3/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/JASPIAuthenticationInfo.java	2011-02-01 16:41:17 UTC (rev 165)
@@ -227,26 +227,6 @@
     */
    public void writeContent(XMLStreamWriter writer) throws XMLStreamException
    {
-      for (int i = 0; i < moduleEntries.size(); i++)
-      {
-         AuthModuleEntry entry = (AuthModuleEntry) moduleEntries.get(i);
-         writer.writeStartElement(Element.AUTH_MODULE.getLocalName());
-         writer.writeAttribute(Attribute.CODE.getLocalName(), entry.getAuthModuleName());
-         writer.writeAttribute(Attribute.FLAG.getLocalName(), entry.getControlFlag().toString().toLowerCase());
-         writer.writeAttribute(Attribute.LOGIN_MODULE_STACK_REF.getLocalName(), entry.getLoginModuleStackHolderName());
-         Map<String, ?> options = entry.getOptions();
-         if (options != null && options.size() > 0)
-         {
-            for (Entry<String, ?> option : options.entrySet())
-            {
-               writer.writeStartElement(Element.MODULE_OPTION.getLocalName());
-               writer.writeAttribute(Attribute.NAME.getLocalName(), option.getKey());
-               writer.writeAttribute(Attribute.VALUE.getLocalName(), option.getValue().toString());
-               writer.writeEndElement();
-            }
-         }
-         writer.writeEndElement();
-      }
       for (int i = 0; i < loginModuleStack.size(); i++)
       {
          LoginModuleStackHolder entry = loginModuleStack.get(i);
@@ -286,6 +266,26 @@
          }
          writer.writeEndElement();
       }
+      for (int i = 0; i < moduleEntries.size(); i++)
+      {
+         AuthModuleEntry entry = (AuthModuleEntry) moduleEntries.get(i);
+         writer.writeStartElement(Element.AUTH_MODULE.getLocalName());
+         writer.writeAttribute(Attribute.CODE.getLocalName(), entry.getAuthModuleName());
+         writer.writeAttribute(Attribute.FLAG.getLocalName(), entry.getControlFlag().toString().toLowerCase());
+         writer.writeAttribute(Attribute.LOGIN_MODULE_STACK_REF.getLocalName(), entry.getLoginModuleStackHolderName());
+         Map<String, ?> options = entry.getOptions();
+         if (options != null && options.size() > 0)
+         {
+            for (Entry<String, ?> option : options.entrySet())
+            {
+               writer.writeStartElement(Element.MODULE_OPTION.getLocalName());
+               writer.writeAttribute(Attribute.NAME.getLocalName(), option.getKey());
+               writer.writeAttribute(Attribute.VALUE.getLocalName(), option.getValue().toString());
+               writer.writeEndElement();
+            }
+         }
+         writer.writeEndElement();
+      }
       writer.writeEndElement();
    }