aboutsummaryrefslogtreecommitdiffstats
path: root/bundle-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-09-06 15:14:52 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-09-06 15:14:52 +0200
commite1ddb62cb85ed7bf6934e809870fa524701cef6a (patch)
treedaf26d7c5dd0c9fec30be5d81b200b7f9e870e10 /bundle-plugin
parent5549ed6df77e23249027fe204a683a15f604fe13 (diff)
Allow inner regex alternative of length > 1
Diffstat (limited to 'bundle-plugin')
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java
index 16858808a58..2a255fd9236 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java
@@ -140,7 +140,7 @@ public class ExportPackageParser {
a backslash followed by another backslash, a single or double quote, or one of the letters b,f,n,r or t
a backslash followed by u followed by four hexadecimal digits ? */
private static Pattern STRING_LITERAL_PATTERN = Pattern
- .compile("\"" + "(?:[^\"\\p{Cntrl}\\\\]|\\\\[\\\\'\"bfnrt]|\\\\u[0-9a-fA-F]{4})+" + "\"");
+ .compile("\"(?:[^\"\\p{Cntrl}\\\\]+|\\\\[\\\\'\"bfnrt]|\\\\u[0-9a-fA-F]{4})+\"");
private static Optional<String> parseStringLiteral(ParsingContext p) {
return p.regexp(STRING_LITERAL_PATTERN).map(quoted -> quoted.substring(1, quoted.length() - 1));