You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/03/12 10:08:56 UTC
svn commit: r1299587 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core:
context/ loader/ reloading/
Author: werpu
Date: Mon Mar 12 09:08:56 2012
New Revision: 1299587
URL: http://svn.apache.org/viewvc?rev=1299587&view=rev
Log:
EXTSCRIPT-154: Code Rewrite/Refactoring, fixing issues
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/loader/ThrowAwayClassloader.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/context/WeavingContext.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/context/WeavingContext.java?rev=1299587&r1=1299586&r2=1299587&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/WeavingContext.java Mon Mar 12 09:08:56 2012
@@ -210,9 +210,10 @@ public class WeavingContext
if (resource.isTainted() || resource.getAClass() == null)
{
clazz = _implementation.forName(clazz.getName());
+ //TODO not needed anymore, done by the forName now
resource.setAClass(clazz);
}
- return null;
+ return clazz;
}
public Object reload(Object instance, int strategyType)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/loader/ThrowAwayClassloader.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/loader/ThrowAwayClassloader.java?rev=1299587&r1=1299586&r2=1299587&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/loader/ThrowAwayClassloader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/loader/ThrowAwayClassloader.java Mon Mar 12 09:08:56 2012
@@ -55,6 +55,9 @@ public class ThrowAwayClassloader extend
*/
public Class<?> loadClass(String className) throws ClassNotFoundException
{
+ if(className.contains("TestResourceHandler")) {
+ System.out.println("Debugppint found");
+ }
ClassResource res = (ClassResource) WeavingContext.getInstance().getResource(className);
if (res == null) return super.loadClass(className);
if (!res.isTainted() && res.getAClass() != null) return res.getAClass();
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=1299587&r1=1299586&r2=1299587&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:08:56 2012
@@ -59,10 +59,13 @@ 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
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
- if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
+
+ if (aclass == null || aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
//class of this object has not changed although
// reload is enabled we can skip the rest now
return scriptingInstance;