Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 755EF914E for ; Fri, 16 Mar 2012 09:01:10 +0000 (UTC) Received: (qmail 11595 invoked by uid 500); 16 Mar 2012 09:01:10 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 11535 invoked by uid 500); 16 Mar 2012 09:01:10 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 11526 invoked by uid 99); 16 Mar 2012 09:01:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2012 09:01:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 16 Mar 2012 09:01:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 00CCE23888EA for ; Fri, 16 Mar 2012 09:00:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1301383 - in /felix/trunk/fileinstall/src: main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java Date: Fri, 16 Mar 2012 09:00:44 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120316090045.00CCE23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Fri Mar 16 09:00:44 2012 New Revision: 1301383 URL: http://svn.apache.org/viewvc?rev=1301383&view=rev Log: [FELIX-3047] Infinite loop in File Install if java.io.tmpdir is non-writable Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java?rev=1301383&r1=1301382&r2=1301383&view=diff ============================================================================== --- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java (original) +++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java Fri Mar 16 09:00:44 2012 @@ -97,7 +97,7 @@ public class DirectoryWatcher extends Th static final SecureRandom random = new SecureRandom(); - static final File javaIoTmpdir = new File(System.getProperty("java.io.tmpdir")); + final File javaIoTmpdir = new File(System.getProperty("java.io.tmpdir")); Dictionary properties; File watchedDirectory; @@ -560,6 +560,9 @@ public class DirectoryWatcher extends Th { if (tmpDir == null) { + if (!javaIoTmpdir.exists() && !javaIoTmpdir.mkdirs()) { + throw new IllegalStateException("Unable to create temporary directory " + javaIoTmpdir); + } for (;;) { File f = new File(javaIoTmpdir, "fileinstall-" + Long.toString(random.nextLong())); Modified: felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java?rev=1301383&r1=1301382&r2=1301383&view=diff ============================================================================== --- felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java (original) +++ felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java Fri Mar 16 09:00:44 2012 @@ -168,11 +168,11 @@ public class DirectoryWatcherTest extend assertEquals( "POLL parameter correctly read", 500l, dw.poll ); assertEquals( "LOG_LEVEL parameter correctly read", 1, dw.logLevel ); - assertTrue( "DIR parameter correctly read", dw.watchedDirectory.getAbsolutePath().endsWith( - "src" + File.separatorChar + "test" + File.separatorChar + "resources" ) ); + assertTrue("DIR parameter correctly read", dw.watchedDirectory.getAbsolutePath().endsWith( + "src" + File.separatorChar + "test" + File.separatorChar + "resources")); assertTrue( "TMPDIR parameter correctly read", dw.tmpDir.getAbsolutePath().endsWith( "src" + File.separatorChar + "test" + File.separatorChar + "resources" ) ); - assertEquals( "START_NEW_BUNDLES parameter correctly read", false, dw.startBundles ); + assertEquals("START_NEW_BUNDLES parameter correctly read", false, dw.startBundles); assertEquals( "FILTER parameter correctly read", ".*\\.cfg", dw.filter ); EasyMock.verify(new Object[]{mockBundleContext}); } @@ -189,11 +189,11 @@ public class DirectoryWatcherTest extend assertTrue( "DIR parameter correctly read", dw.watchedDirectory.getAbsolutePath().endsWith( "src" + File.separatorChar + "test" + File.separatorChar + "resources" ) ); - assertEquals( "Default POLL parameter correctly read", 2000l, dw.poll ); + assertEquals("Default POLL parameter correctly read", 2000l, dw.poll); assertEquals( "Default LOG_LEVEL parameter correctly read", 1, dw.logLevel ); - assertTrue( "Default TMPDIR parameter correctly read", dw.tmpDir.getAbsolutePath().startsWith( - new File(System.getProperty("java.io.tmpdir")).getAbsolutePath()) ); - assertEquals( "Default START_NEW_BUNDLES parameter correctly read", true, dw.startBundles ); + assertTrue("Default TMPDIR parameter correctly read", dw.tmpDir.getAbsolutePath().startsWith( + new File(System.getProperty("java.io.tmpdir")).getAbsolutePath())); + assertEquals("Default START_NEW_BUNDLES parameter correctly read", true, dw.startBundles); assertEquals( "Default FILTER parameter correctly read", null, dw.filter ); EasyMock.verify(new Object[]{mockBundleContext}); } @@ -205,7 +205,7 @@ public class DirectoryWatcherTest extend EasyMock.expect(mockBundleContext.createFilter((String) EasyMock.anyObject())) .andReturn(null); EasyMock.expect(Long.valueOf(mockPackageAdmin.getBundleType(mockBundle))) - .andReturn(new Long(PackageAdmin.BUNDLE_TYPE_FRAGMENT) ); + .andReturn(new Long(PackageAdmin.BUNDLE_TYPE_FRAGMENT)); EasyMock.replay(new Object[]{mockBundleContext, mockPackageAdmin, mockBundle}); FileInstall.padmin = new MockServiceTracker( mockBundleContext, mockPackageAdmin ); @@ -215,6 +215,43 @@ public class DirectoryWatcherTest extend EasyMock.verify(new Object[]{mockBundleContext}); } + + public void testInvalidTempDir() throws Exception + { + String oldTmpDir = System.getProperty("java.io.tmpdir"); + + try + { + File parent = new File("target/tmp"); + parent.mkdirs(); + parent.setWritable(false, false); + File tmp = new File(parent, "tmp"); + System.setProperty("java.io.tmpdir", tmp.toString()); + + mockBundleContext.addBundleListener((BundleListener) org.easymock.EasyMock.anyObject()); + EasyMock.expect(mockBundleContext.createFilter((String) EasyMock.anyObject())) + .andReturn(null); + EasyMock.expect(Long.valueOf(mockPackageAdmin.getBundleType(mockBundle))) + .andReturn(new Long(PackageAdmin.BUNDLE_TYPE_FRAGMENT)); + EasyMock.replay(new Object[]{mockBundleContext, mockPackageAdmin, mockBundle}); + + FileInstall.padmin = new MockServiceTracker( mockBundleContext, mockPackageAdmin ); + + try + { + dw = new DirectoryWatcher( props, mockBundleContext ); + fail("Expected an IllegalStateException"); + } + catch (IllegalStateException e) + { + // expected + } + } + finally + { + System.setProperty("java.io.tmpdir", oldTmpDir); + } + } }