8155727: java/util/concurrent/locks/Lock/TimedAcquireLeak.java timeouts

Fix regex pattern to handle possible (module@version) text

Reviewed-by: ctornqvi, martin
This commit is contained in:
Harold Seigel 2016-04-29 15:17:46 -04:00
parent 042d2821ff
commit 528b2cc81a

@ -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 @@ public class TimedAcquireLeak {
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<Integer> objectsInUse =
new Callable<Integer>() { public Integer call() {
Integer i = Integer.parseInt(