use SequenceInputStream to concatenate...

resources to avoid intermediate Strings

Signed-off-by: Christoph Rueger <[email protected]>

biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.SequenceInputStream;
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.file.FileVisitOption;
@@ -390,19 +391,21 @@ public boolean putResource(String path, Resource resource, DupStrategy strategy)
 				directories.put(dir, null);
 			}
 		}
-		boolean duplicate = s.containsKey(path);
+
+		Resource existing = s.get(path);
+		boolean duplicate = existing != null;
 		if (!duplicate || DupStrategy.OVERWRITE == strategy) {
 			resources.put(path, resource);
 			s.put(path, resource);
 			updateModified(resource.lastModified(), path);
 		}
 		else if (duplicate && DupStrategy.APPEND == strategy) {
-			try {
+			try (SequenceInputStream in = new SequenceInputStream(existing.openInputStream(),
+				resource.openInputStream());) {
 
-				String current = IO.collect(getResource(path).openInputStream());
-				String toAppend = IO.collect(resource.openInputStream());
-				String appended = current + toAppend;
-				Resource r = new EmbeddedResource(appended, 0L);
+				long lastModified = Math.max(existing.lastModified(), resource.lastModified());
+				Resource r = new EmbeddedResource(ByteBuffer.wrap(in.readAllBytes()),
+					lastModified);
 				// addExtra(r, extra.get("extra"));
 				resources.put(path, r);
 				s.put(path, r);