Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 90634 invoked from network); 16 Dec 2009 21:32:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Dec 2009 21:32:18 -0000 Received: (qmail 41973 invoked by uid 500); 16 Dec 2009 21:32:18 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 41871 invoked by uid 500); 16 Dec 2009 21:32:17 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 41862 invoked by uid 99); 16 Dec 2009 21:32:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 21:32:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 21:32:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 681E523889D5; Wed, 16 Dec 2009 21:31:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r891432 - in /myfaces/extensions/scripting/trunk: core/core/src/main/java/org/apache/myfaces/scripting/api/ examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/ Date: Wed, 16 Dec 2009 21:31:54 -0000 To: commits@myfaces.apache.org From: werpu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091216213154.681E523889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: werpu Date: Wed Dec 16 21:31:53 2009 New Revision: 891432 URL: http://svn.apache.org/viewvc?rev=891432&view=rev Log: added mutexes on the correct parts of the system so that the iteration over the beans does not happen at the same time as the alteration Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=891432&r1=891431&r2=891432&view=diff ============================================================================== --- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original) +++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Wed Dec 16 21:31:53 2009 @@ -254,26 +254,38 @@ public void requestRefresh() { if (WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine())) { - fullRecompile(); - refreshAllManagedBeans(); - } else { - //shortcut to avoid heavier operations in the beginning - long globalBeanRefreshTimeout = WeavingContext.getRefreshContext().getPersonalScopedBeanRefresh(); - if (globalBeanRefreshTimeout == -1l) return; - - Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap(); - Long timeOut = (Long) sessionMap.get(ScriptingConst.SESS_BEAN_REFRESH_TIMER); - if (timeOut == null || timeOut < globalBeanRefreshTimeout) { - refreshPersonalScopedBeans(); + // we set a lock over the compile and bean refresh + //and an inner check again to avoid unneeded compile triggers + synchronized (BEAN_LOCK) { + if (WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine())) { + recompileRefresh(); + return; + } } } + personalScopeRefresh(); + + } + + private void personalScopeRefresh() { + //shortcut to avoid heavier operations in the beginning + long globalBeanRefreshTimeout = WeavingContext.getRefreshContext().getPersonalScopedBeanRefresh(); + if (globalBeanRefreshTimeout == -1l) return; + + Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap(); + Long timeOut = (Long) sessionMap.get(ScriptingConst.SESS_BEAN_REFRESH_TIMER); + if (timeOut == null || timeOut < globalBeanRefreshTimeout) { + refreshPersonalScopedBeans(); + } + } + + private void recompileRefresh() { + fullRecompile(); + refreshAllManagedBeans(); } protected void refreshAllManagedBeans() { - //TODO set a mutex and a double check here to avoid - //double dropping the entire managed beans - //in case of multiuser access if (FacesContext.getCurrentInstance() == null) { return;//no npe allowed @@ -315,9 +327,7 @@ Class managedBeanClass = entry.getValue().getManagedBeanClass(); if (WeavingContext.isDynamic(managedBeanClass)) { //managed bean class found we drop the class from our session - synchronized (BEAN_LOCK) { - removeBeanReferences(entry.getValue()); - } + removeBeanReferences(entry.getValue()); } //one bean tainted we have to taint all dynamic beans otherwise we will get classcast //exceptions Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=891432&r1=891431&r2=891432&view=diff ============================================================================== --- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original) +++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Wed Dec 16 21:31:53 2009 @@ -12,17 +12,17 @@ import java.io.InputStreamReader; import java.io.IOException; - +@ManagedBean(name = "javatestbean") +@SessionScoped public class TestBean2 { - String sayHello = "hello worldgggg"; String hello2 = "hello from added attribute"; String hello3 = "hello from added attribute 2"; public String getSayHello() { - return "aaa Java dynamic bean - "+TestClass2.hello2 + hello3; + return "Testbean2 Java dynamic bean - "+TestClass2.hello2 + hello3; } public String getSayHello2() { Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java?rev=891432&r1=891431&r2=891432&view=diff ============================================================================== --- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java (original) +++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java Wed Dec 16 21:31:53 2009 @@ -15,8 +15,8 @@ import java.io.IOException; import java.nio.CharBuffer; -@ManagedBean(name = "javatestbean") -@SessionScoped + + public class TestBean3 { String sayHello = "hello world"; String hello2 = "hello from added attribute";