Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 62237 invoked from network); 23 Mar 2009 15:15:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Mar 2009 15:15:08 -0000 Received: (qmail 97527 invoked by uid 500); 23 Mar 2009 15:15:08 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 97470 invoked by uid 500); 23 Mar 2009 15:15:08 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 97461 invoked by uid 99); 23 Mar 2009 15:15:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2009 15:15: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; Mon, 23 Mar 2009 15:15:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 43E812388995; Mon, 23 Mar 2009 15:14:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r757410 - /geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java Date: Mon, 23 Mar 2009 15:14:46 -0000 To: scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090323151447.43E812388995@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Mon Mar 23 15:14:43 2009 New Revision: 757410 URL: http://svn.apache.org/viewvc?rev=757410&view=rev Log: Avoid the file content caching system as attributes may be changed externally Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java?rev=757410&r1=757409&r2=757410&view=diff ============================================================================== --- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java (original) +++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java Mon Mar 23 15:14:43 2009 @@ -22,7 +22,10 @@ import org.apache.commons.vfs.FileContentInfoFactory; import org.apache.commons.vfs.FileName; import org.apache.commons.vfs.FileType; +import org.apache.commons.vfs.FileContent; +import org.apache.commons.vfs.FileSystemException; import org.apache.commons.vfs.provider.AbstractFileObject; +import org.apache.commons.vfs.provider.DefaultFileContent; import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData; import java.io.ByteArrayInputStream; @@ -40,6 +43,7 @@ private final MetaFileSystem fileSystem; private MetaData data; + private FileContent content; public MetaFileObject(final FileName fileName, final MetaFileSystem fileSystem) { super(fileName, fileSystem); @@ -52,7 +56,7 @@ if (data == null) { throw new IllegalStateException("Meta data has not been attached"); } - + return data; } @@ -121,10 +125,18 @@ if (data == null) { data = fileSystem.lookupData(this); } + content = new DefaultFileContent(this, getFileContentInfoFactory()); } @Override protected void doDetach() throws Exception { data = null; + content = null; + } + + @Override + public FileContent getContent() throws FileSystemException { + super.getContent(); + return content; } } \ No newline at end of file