/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.security.auth.callback;

import java.lang.reflect.UndeclaredThrowableException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;

import javax.security.auth.callback.CallbackHandler;
import javax.security.jacc.PolicyContext;
import javax.security.jacc.PolicyContextException;

/**
 Security actions for the callback package

 @author Scott.Stark@jboss.org
 @version $Revision$
 */
public class SecurityActions
{
   interface PolicyContextActions
   {
      /** The JACC PolicyContext key for the current Subject */
      public static final String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
      PolicyContextActions PRIVILEGED = new PolicyContextActions()
      {
         private final PrivilegedExceptionAction<CallbackHandler> exAction = new PrivilegedExceptionAction<CallbackHandler>()
         {
            public CallbackHandler run() throws Exception
            {
               return (CallbackHandler) PolicyContext.getContext(CALLBACK_HANDLER_KEY);
            }
         };
         public CallbackHandler getContextCallbackHandler()
            throws PolicyContextException
         {
            try
            {
               return (CallbackHandler) AccessController.doPrivileged(exAction);
            }
            catch(PrivilegedActionException e)
            {
               Exception ex = e.getException();
               if( ex instanceof PolicyContextException )
                  throw (PolicyContextException) ex;
               else
                  throw new UndeclaredThrowableException(ex);
            }
         }
      };

      PolicyContextActions NON_PRIVILEGED = new PolicyContextActions()
      {
         public CallbackHandler getContextCallbackHandler()
            throws PolicyContextException
         {
            return (CallbackHandler) PolicyContext.getContext(CALLBACK_HANDLER_KEY);
         }
      };

      CallbackHandler getContextCallbackHandler()
         throws PolicyContextException;
   }

   static CallbackHandler getContextCallbackHandler()
      throws PolicyContextException
   {
      if(System.getSecurityManager() == null)
      {
         return PolicyContextActions.NON_PRIVILEGED.getContextCallbackHandler();
      }
      else
      {
         return PolicyContextActions.PRIVILEGED.getContextCallbackHandler();
      }
   }

}

@@ -3139,37 +3139,24 @@
      throws 
-PolicyContext
 Exception%0A  
@@ -3414,7 +3414,5 @@
   %7D%0A
-%0A%7D%0A
+%7D

use Exception for standalone