dev@javaserverfaces.java.net

Seeking Review: Fix for cactus tests in latest Glassfish

From: Ed Burns <edburns_at_yahoo.com>
Date: Wed, 13 Jul 2005 17:01:12 -0700 (PDT)

This is something of a hack, but it's not the first of
its class.

Index: ConfigureListener.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/config/ConfigureListener.java,v
retrieving revision 1.40
diff -u -r1.40 ConfigureListener.java
--- ConfigureListener.java 3 Jul 2005 19:17:14 -0000
1.40
+++ ConfigureListener.java 14 Jul 2005 00:00:05 -0000
@@ -1364,7 +1364,14 @@
        
appAssociate.setExpressionFactory(jspAppContext.getExpressionFactory());
 
         // register compositeELResolver with JSP
-
jspAppContext.addELResolver(compositeELResolverForJsp);
+ try {
+
jspAppContext.addELResolver(compositeELResolverForJsp);
+ }
+ catch (IllegalStateException e) {
+ if (!Util.isUnitTestModeEnabled()) {
+ throw e;
+ }
+ }
 
         // register JSF ELContextListenerImpl with
Jsp
         ELContextListenerImpl elContextListener = new
ELContextListenerImpl();


__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com