myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r927390 - in /myfaces/extensions/scripting/trunk/extscript-core-root: extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/ extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetati...
Date Thu, 25 Mar 2010 13:26:11 GMT
Author: werpu
Date: Thu Mar 25 13:26:11 2010
New Revision: 927390

URL: http://svn.apache.org/viewvc?rev=927390&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-100

this should fix brunos problem he now has after setting everyting up correctly, still dont
know if it now works, bruno has yet to send me some code, I will try to replicate it with
our fullstack example

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/StartupServletContextPlugin.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/StartupServletContextPlugin.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/StartupServletContextPlugin.java?rev=927390&r1=927389&r2=927390&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/StartupServletContextPlugin.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/jsf/StartupServletContextPlugin.java
Thu Mar 25 13:26:11 2010
@@ -18,6 +18,8 @@
  */
 package org.apache.myfaces.scripting.jsf;
 
+import org.apache.myfaces.scripting.core.util.WeavingContext;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -41,6 +43,7 @@ public class StartupServletContextPlugin
     }
 
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
+        WeavingContext.getFileChangedDaemon().clear();
     }
 
 }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java?rev=927390&r1=927389&r2=927390&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
Thu Mar 25 13:26:11 2010
@@ -41,7 +41,7 @@ public class VariableResolverProxy exten
 
     public Object resolveVariable(FacesContext facesContext, String s) throws EvaluationException
{
         Object variable = _delegate.resolveVariable(facesContext, s);
-        if (WeavingContext.isDynamic(variable.getClass()))
+        if (variable != null && WeavingContext.isDynamic(variable.getClass()))
             variable = WeavingContext.getWeaver().reloadScriptingInstance(variable, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN);
         return variable;
     }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java?rev=927390&r1=927389&r2=927390&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
Thu Mar 25 13:26:11 2010
@@ -41,7 +41,7 @@ public class VariableResolverProxy exten
 
     public Object resolveVariable(FacesContext facesContext, String s) throws EvaluationException
{
         Object variable = _delegate.resolveVariable(facesContext, s);
-        if (WeavingContext.isDynamic(variable.getClass()))
+        if (variable != null && WeavingContext.isDynamic(variable.getClass()))
             variable = WeavingContext.getWeaver().reloadScriptingInstance(variable, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN);
         return variable;
     }



Mime
View raw message