You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2018/07/13 09:09:53 UTC
svn commit: r1835798 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
Author: pauls
Date: Fri Jul 13 09:09:53 2018
New Revision: 1835798
URL: http://svn.apache.org/viewvc?rev=1835798&view=rev
Log:
FELIX-5886: Only log errors if we can't load the bytes of an existing entry and not if the entry doesn't exist at all.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java?rev=1835798&r1=1835797&r2=1835798&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/DirectoryContent.java Fri Jul 13 09:09:53 2018
@@ -108,7 +108,7 @@ public class DirectoryContent implements
try
{
- return BundleCache.read(BundleCache.getSecureAction().getFileInputStream(file), file.length());
+ return BundleCache.getSecureAction().fileExists(file) ? BundleCache.read(BundleCache.getSecureAction().getFileInputStream(file), file.length()) : null;
}
catch (Exception ex)
{
@@ -130,7 +130,7 @@ public class DirectoryContent implements
File file = new File(m_dir, name);
try
{
- return BundleCache.getSecureAction().getFileInputStream(file);
+ return BundleCache.getSecureAction().fileExists(file) ? BundleCache.getSecureAction().getFileInputStream(file) : null;
}
catch (Exception ex)
{