diff options
author | Jose <jose@zeroc.com> | 2013-07-04 00:19:48 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2013-07-04 00:19:48 +0200 |
commit | 77fac57f375246bdc73f9a2af6cd985ca330cb6f (patch) | |
tree | a48e20fec058bfe82f7bbc3a550fde8d692a3ebc /java/src/IceUtilInternal/FileLock.java | |
parent | minor C# fix in IceSSL (diff) | |
download | ice-77fac57f375246bdc73f9a2af6cd985ca330cb6f.tar.bz2 ice-77fac57f375246bdc73f9a2af6cd985ca330cb6f.tar.xz ice-77fac57f375246bdc73f9a2af6cd985ca330cb6f.zip |
Fixed ICE-5340 - FileLock jlint errors in android
Diffstat (limited to 'java/src/IceUtilInternal/FileLock.java')
-rw-r--r-- | java/src/IceUtilInternal/FileLock.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/src/IceUtilInternal/FileLock.java b/java/src/IceUtilInternal/FileLock.java index 1b850f3bfde..6a540a48f86 100644 --- a/java/src/IceUtilInternal/FileLock.java +++ b/java/src/IceUtilInternal/FileLock.java @@ -14,7 +14,6 @@ import java.io.RandomAccessFile; import java.io.FileWriter; import java.nio.channels.FileChannel; import java.nio.channels.OverlappingFileLockException; -import java.lang.management.ManagementFactory; public final class FileLock { @@ -71,17 +70,26 @@ public final class FileLock // The output is JVM dependent. With the Sun // implementation it's `pid@hostname' // - _randFile.writeUTF(ManagementFactory.getRuntimeMXBean().getName()); + Class<?> fC = IceInternal.Util.findClass("java.lang.management.ManagementFactory", null); + Class<?> mC = IceInternal.Util.findClass("java.lang.management.RuntimeMXBean", null); + + java.lang.reflect.Method getRuntimeMXBean = fC.getDeclaredMethod("getRuntimeMXBean", (Class<?>[])null); + + java.lang.reflect.Method getName = mC.getDeclaredMethod("getName", (Class<?>[])null); + + Object mxBean = getRuntimeMXBean.invoke(null); + + _randFile.writeUTF((String)getName.invoke(mxBean)); // // Don't close _randFile here or the lock will be released. It is called // during release see comments there. // } - catch(java.io.IOException ex) + catch(java.lang.Exception ex) { release(); - throw new IceUtil.FileLockException(path); + throw new IceUtil.FileLockException(path, ex); } } } |