myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1299601 - in /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core: monitor/ClassResource.java reloading/SimpleReloadingStrategy.java
Date Mon, 12 Mar 2012 09:55:58 GMT
Author: werpu
Date: Mon Mar 12 09:55:58 2012
New Revision: 1299601

URL: http://svn.apache.org/viewvc?rev=1299601&view=rev
Log:
EXTSCRIPT-154: Code Rewrite/Refactoring, loading classes now works

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java?rev=1299601&r1=1299600&r2=1299601&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
Mon Mar 12 09:55:58 2012
@@ -146,13 +146,13 @@ public class ClassResource extends Watch
 
     public void setTainted(boolean value)
     {
-        if (isTainted()) return;
-        if (value)
+        //if (isTainted()) return;
+        if (value && !tainted)
         {
             //TODO add logging event here
             logger.info("[EXT-SCRIPTING] tainting " + getSourceFile());
         }
-        tainted = true;
+        tainted = value;
     }
 
     /**

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java?rev=1299601&r1=1299600&r2=1299601&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
Mon Mar 12 09:55:58 2012
@@ -59,10 +59,7 @@ public class SimpleReloadingStrategy imp
      * @return either the same object or a new instance utilizing the changed code
      */
     public Object reload(Object scriptingInstance, int artifactType) {
-        if(scriptingInstance.getClass().getName().contains("TestResourceHandler")) {
-            System.out.println("debugpoint found");
-        }
-        //reload the class to get new static content if needed
+       //reload the class to get new static content if needed
         Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
 
         if (aclass == null || aclass.hashCode() == scriptingInstance.getClass().hashCode())
{



Mime
View raw message