You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/10/13 18:14:52 UTC
svn commit: r824828 - in
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal:
DirectoryWatcher.java Scanner.java
Author: gnodet
Date: Tue Oct 13 16:14:52 2009
New Revision: 824828
URL: http://svn.apache.org/viewvc?rev=824828&view=rev
Log:
FELIX-1750: fileinstall does not work on jdk 1.4
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.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=824828&r1=824827&r2=824828&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 Tue Oct 13 16:14:52 2009
@@ -520,7 +520,7 @@
String value = (String) properties.get(property);
if (value != null)
{
- return Boolean.parseBoolean(value);
+ return Boolean.valueOf(value).booleanValue();
}
return dflt;
}
@@ -801,9 +801,9 @@
artifact.setLastModified(Util.getLastModified(path));
log("Updated " + path, null);
}
- catch (Exception e)
+ catch (Throwable t)
{
- log("Failed to update artifact " + artifact.getPath(), e);
+ log("Failed to update artifact " + artifact.getPath(), t);
}
return bundle;
}
Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java?rev=824828&r1=824827&r2=824828&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java Tue Oct 13 16:14:52 2009
@@ -84,7 +84,7 @@
{
for (Iterator it = files.iterator(); it.hasNext();)
{
- storedChecksums.put(it.next(), Long.valueOf(0));
+ storedChecksums.put(it.next(), new Long(0));
}
}
@@ -113,11 +113,11 @@
long lastChecksum = lastChecksums.get(file) != null ? ((Long) lastChecksums.get(file)).longValue() : 0;
long storedChecksum = storedChecksums.get(file) != null ? ((Long) storedChecksums.get(file)).longValue() : 0;
long newChecksum = checksum(file);
- lastChecksums.put(file, Long.valueOf(newChecksum));
+ lastChecksums.put(file, new Long(newChecksum));
// Only handle file when it does not change anymore and it has changed since last reported
if ((newChecksum == lastChecksum || reportImmediately) && newChecksum != storedChecksum)
{
- storedChecksums.put(file, Long.valueOf(newChecksum));
+ storedChecksums.put(file, new Long(newChecksum));
files.add(file);
}
removed.remove(file);