| commit | 287011aaa46bb257869588f70684a5bdbee7fc8a | [log] [tgz] |
|---|---|---|
| author | Werner Punz <werpu@apache.org> | Mon Mar 12 09:55:58 2012 +0000 |
| committer | Werner Punz <werpu@apache.org> | Mon Mar 12 09:55:58 2012 +0000 |
| tree | 2cc4c107ada68108c6603d70b4fe8d6d610a78a7 | |
| parent | 74624e1f89a9c200f6d3a0cac7fbd0a6fb1d31ac [diff] |
EXTSCRIPT-154: Code Rewrite/Refactoring, loading classes now works git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1299601 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java index 2fe7dfa..195070c 100644 --- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java +++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
@@ -146,13 +146,13 @@ 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; } /**
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java index e01a0da..09a96d0 100644 --- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java +++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
@@ -59,10 +59,7 @@ * @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()) {