Index: java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
===================================================================
--- java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java	(revision 1742513)
+++ java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java	(working copy)
@@ -36,8 +36,17 @@
 
 public class CallbackHandlerImpl implements CallbackHandler {
 
-    private static final Log log = LogFactory.getLog(CallbackHandlerImpl.class);
-    private static final StringManager sm = StringManager.getManager(CallbackHandlerImpl.class);
+    static final Log log = LogFactory.getLog(CallbackHandlerImpl.class);
+    static final StringManager sm = StringManager.getManager(CallbackHandlerImpl.class);
+
+
+    @Override
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        new CallbackHandlerInstance().handle(callbacks);
+    }
+}
+
+class CallbackHandlerInstance extends CallbackHandlerImpl {
 
     private String name;
     private Principal principal;