Return-Path: Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: (qmail 19764 invoked from network); 15 Jul 2009 21:08:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jul 2009 21:08:04 -0000 Received: (qmail 18121 invoked by uid 500); 15 Jul 2009 21:08:13 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 18048 invoked by uid 500); 15 Jul 2009 21:08:13 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 17973 invoked by uid 99); 15 Jul 2009 21:08:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jul 2009 21:08:08 +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, 15 Jul 2009 21:08:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30B612388A39; Wed, 15 Jul 2009 21:07:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r794418 - /struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java Date: Wed, 15 Jul 2009 21:07:46 -0000 To: commits@struts.apache.org From: musachy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090715210746.30B612388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: musachy Date: Wed Jul 15 21:07:45 2009 New Revision: 794418 URL: http://svn.apache.org/viewvc?rev=794418&view=rev Log: fix bug that added all the watched dirs as stores to the reloading classloader Modified: struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java Modified: struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java?rev=794418&r1=794417&r2=794418&view=diff ============================================================================== --- struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java (original) +++ struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java Wed Jul 15 21:07:45 2009 @@ -110,8 +110,9 @@ List dirs = new ArrayList(); getAllPaths(file, dirs); + classLoader.addResourceStore(new FileResourceStore(file)); + for (File dir : dirs) { - classLoader.addResourceStore(new FileResourceStore(dir)); //register with the fam fam.addListener(dir, this); LOG.debug("Watching [#0] for changes", dir.getAbsolutePath());