| commit | 4eb49be9158ab90883117bd106bbbc31f4778fbd | [log] [tgz] |
|---|---|---|
| author | Guillaume Nodet <gnodet@apache.org> | Fri Feb 19 23:10:08 2010 +0000 |
| committer | Guillaume Nodet <gnodet@apache.org> | Fri Feb 19 23:10:08 2010 +0000 |
| tree | 2022f9d5f2c93f8b5f82b7b7ab8cfeb76f025300 | |
| parent | aa2a306d91da281d1dd657fd705e5dffb3f798ea [diff] |
FELIX-2112: Carriage returns are removed from instructions, but the lines should be trimmed alltogether git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@912028 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index 756681d..d9da0be 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -267,7 +267,7 @@ } else { - value = value.replaceAll( "[\r\n]", "" ); + value = value.replaceAll( "\\p{Blank}*[\r\n]\\p{Blank}*", "" ); } transformedInstructions.put( key, value );