# HG changeset patch # User hseigel # Date 1461957466 14400 # Node ID 81b7cf7164278f64dc2d6bb232aacb877e3739c0 # Parent 8c2db7e479ae60ac5f0cca723357b2eb1b8f4624 8155727: java/util/concurrent/locks/Lock/TimedAcquireLeak.java timeouts. Summary: Fix regex pattern to handle possible (module@version) text Reviewed-by: ctornqvi, martin diff -r 8c2db7e479ae -r 81b7cf716427 jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java --- a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java Thu Apr 28 23:08:17 2016 -0700 +++ b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java Fri Apr 29 15:17:46 2016 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -167,7 +167,7 @@ final String childPid, final String className) { final String regex = - "(?m)^ *[0-9]+: +([0-9]+) +[0-9]+ +\\Q"+className+"\\E$"; + "(?m)^ *[0-9]+: +([0-9]+) +[0-9]+ +\\Q"+className+"\\E(?:$| )"; final Callable objectsInUse = new Callable() { public Integer call() { Integer i = Integer.parseInt(