Latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1351156 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java b/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
index 38e67be..db2a175 100644
--- a/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
+++ b/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
@@ -339,7 +339,7 @@
channel.force(false);
}
- private short checksum(int flags, int compressedLength, int totalLength, byte[] sha1) {
+ short checksum(int flags, int compressedLength, int totalLength, byte[] sha1) {
CRC32 crc = new CRC32();
crc.update(flags);
crc.update(flags >> 8);
diff --git a/bundleplugin/src/main/java/aQute/libg/forker/Forker.java b/bundleplugin/src/main/java/aQute/libg/forker/Forker.java
index 3929ca4..14bb0f8 100644
--- a/bundleplugin/src/main/java/aQute/libg/forker/Forker.java
+++ b/bundleplugin/src/main/java/aQute/libg/forker/Forker.java
@@ -64,7 +64,7 @@
/**
* Cancel this job
*/
- private void cancel() {
+ void cancel() {
if (!canceled.getAndSet(true)) {
synchronized (this) {
if (t != null)
@@ -166,7 +166,7 @@
*
* @param done
*/
- private void done(Job done) {
+ void done(Job done) {
synchronized (this) {
System.err.println("count = " + count);
executing.remove(done);
diff --git a/bundleplugin/src/main/java/aQute/libg/header/Attrs.java b/bundleplugin/src/main/java/aQute/libg/header/Attrs.java
index 8ff65dd..40fefcc 100644
--- a/bundleplugin/src/main/java/aQute/libg/header/Attrs.java
+++ b/bundleplugin/src/main/java/aQute/libg/header/Attrs.java
@@ -289,6 +289,15 @@
return Long.parseLong(s.trim());
case VERSION :
return Version.parseVersion(s);
+ case DOUBLE :
+ return Double.parseDouble(s.trim());
+
+ case DOUBLES :
+ case LONGS :
+ case STRINGS :
+ case VERSIONS :
+ // Cannot happen since the sub is null
+ return null;
}
return null;
}
diff --git a/bundleplugin/src/main/java/aQute/libg/reporter/ReporterMessages.java b/bundleplugin/src/main/java/aQute/libg/reporter/ReporterMessages.java
index 8d782cf..90da59b 100644
--- a/bundleplugin/src/main/java/aQute/libg/reporter/ReporterMessages.java
+++ b/bundleplugin/src/main/java/aQute/libg/reporter/ReporterMessages.java
@@ -31,7 +31,7 @@
}, new InvocationHandler() {
public Object invoke(Object target, Method method, Object[] args) throws Throwable {
- if (reporter.isExceptions()) {
+ if (reporter.isExceptions() && args!=null) {
for (Object o : args) {
if (o instanceof Throwable)
((Throwable) o).printStackTrace();
diff --git a/bundleplugin/src/main/java/aQute/libg/reporter/packageinfo b/bundleplugin/src/main/java/aQute/libg/reporter/packageinfo
index ef7df68..0117a56 100644
--- a/bundleplugin/src/main/java/aQute/libg/reporter/packageinfo
+++ b/bundleplugin/src/main/java/aQute/libg/reporter/packageinfo
@@ -1 +1 @@
-version 1.2
+version 1.3