You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by jb...@apache.org on 2018/08/03 09:29:35 UTC

[karaf] 01/01: Merge pull request #542 from mzipay/KARAF-5798

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 77d11a601be54b2627fa86819256f5295c01e1ae
Merge: 51139fb efa4ffd
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Aug 3 11:29:32 2018 +0200

    Merge pull request #542 from mzipay/KARAF-5798
    
    [KARAF-5798] use a consistent way to get the Karaf process ID; write …

 .../java/org/apache/karaf/main/InstanceHelper.java |  35 ++++---
 main/src/main/java/org/apache/karaf/main/Main.java |   5 +-
 .../org/apache/karaf/main/MainLockingTest.java     | 101 +++++++++++++++++++--
 .../test/java/org/apache/karaf/main/MockLock.java  |   2 +
 4 files changed, 114 insertions(+), 29 deletions(-)