Sync bndlib code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1399825 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java b/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java
index d6be831..fbbf4fa 100755
--- a/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java
+++ b/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java
@@ -23,6 +23,7 @@
import java.io.*;
import java.net.*;
+import java.text.*;
import java.util.*;
import java.util.Map.Entry;
import java.util.jar.*;
@@ -712,12 +713,17 @@
return getBndInfo("version", "<unknown>");
}
+ static SimpleDateFormat df = new SimpleDateFormat("EEE MMM dd hh:mm:ss z yyyy");
public long getBndLastModified() {
String time = getBndInfo("lastmodified", "0");
- try {
+ if ( time.matches("\\d+"))
return Long.parseLong(time);
- }
- catch (Exception e) {
+
+ try {
+ Date parse = df.parse(time);
+ if ( parse != null)
+ return parse.getTime();
+ } catch( ParseException e) {
// Ignore
}
return 0;