[jboss-cvs] Picketbox SVN: r23 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback.

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

Author: anil.saldhana at jboss.com
Date: 2010-02-14 00:37:52 -0500 (Sun, 14 Feb 2010)
New Revision: 23

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/JBossCallbackHandler.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityAssociationHandler.java
Log:
use exception

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/JBossCallbackHandler.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/JBossCallbackHandler.java	2010-02-14 05:34:55 UTC (rev 22)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/JBossCallbackHandler.java	2010-02-14 05:37:52 UTC (rev 23)
@@ -31,7 +31,6 @@
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.jacc.PolicyContextException;
 
 /**
  * Serializable Callback Handler
@@ -109,7 +108,6 @@
          }
          else
          {
-            // Try the JACC context CallbackHandler 
             try
             {
                CallbackHandler handler = SecurityActions.getContextCallbackHandler();
@@ -120,9 +118,10 @@
                   return;
                }
             }
-            catch (PolicyContextException e)
+            catch (Exception e)
             {
-            }
+            } 
+
             throw new UnsupportedCallbackException(c, "Unrecognized Callback");
          }
       }
@@ -168,5 +167,5 @@
          }
       }
       return password;
-   } 
+   }  
 }
\ No newline at end of file

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityAssociationHandler.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityAssociationHandler.java	2010-02-14 05:34:55 UTC (rev 22)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityAssociationHandler.java	2010-02-14 05:37:52 UTC (rev 23)
@@ -123,7 +123,7 @@
                   return;
                }
             }
-            catch (PolicyContextException e)
+            catch (Exception e)
             {
             }
             throw new UnsupportedCallbackException(c, "Unrecognized Callback");