diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a24bb7..829974fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Fixed +- Issue [#322](https://github.com/reportportal/client-java/issues/322): PatternSyntaxException on Android: unescaped '}' in TemplateProcessing regex, by @blundell ## [5.4.14] ### Changed diff --git a/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java b/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java index f3e892cf..a391c65e 100644 --- a/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java +++ b/src/main/java/com/epam/reportportal/service/launch/AbstractJoinedLaunch.java @@ -33,6 +33,7 @@ public class AbstractJoinedLaunch extends LaunchImpl { final LaunchIdLock lock; volatile String uuid; + private static final Random random = new Random(); private static final AtomicLong THREAD_COUNTER = new AtomicLong(); private static final ThreadFactory THREAD_FACTORY = r -> { Thread t = new Thread(r); @@ -45,8 +46,7 @@ public class AbstractJoinedLaunch extends LaunchImpl { private static ScheduledFuture getUpdateTask(String instanceUuid, long updateInterval, LaunchIdLock launchIdLock, ScheduledExecutorService service) { - Random r = new Random(); - int delay = updateInterval > Integer.MAX_VALUE ? r.nextInt(Integer.MAX_VALUE) : r.nextInt((int) updateInterval); + int delay = updateInterval > Integer.MAX_VALUE ? random.nextInt(Integer.MAX_VALUE) : random.nextInt((int) updateInterval); return service.scheduleWithFixedDelay( () -> launchIdLock.updateInstanceUuid(instanceUuid), delay, diff --git a/src/main/java/com/epam/reportportal/utils/formatting/templating/TemplateProcessing.java b/src/main/java/com/epam/reportportal/utils/formatting/templating/TemplateProcessing.java index daddaa8c..4f5ddd3c 100644 --- a/src/main/java/com/epam/reportportal/utils/formatting/templating/TemplateProcessing.java +++ b/src/main/java/com/epam/reportportal/utils/formatting/templating/TemplateProcessing.java @@ -40,7 +40,7 @@ public class TemplateProcessing { public static final String NULL_VALUE = "NULL"; - private static final Pattern TEMPLATE_GROUP = Pattern.compile("\\{([\\w$]+(\\.[\\w$]+)*)}"); + private static final Pattern TEMPLATE_GROUP = Pattern.compile("\\{([\\w$]+(\\.[\\w$]+)*)\\}"); private TemplateProcessing() { throw new IllegalStateException("Static only class");